Re: git: 722b16673c40 - main - acpica: Import ACPICA 20230331
Date: Wed, 31 Jan 2024 14:49:59 UTC
On Wed, 31 Jan 2024 at 00:17, Cy Schubert <Cy.Schubert@cschubert.com> wrote: > > but would the history graph be different? Or does that matter? It will be different - a merge would be main --- A --- B ---- C ---- D / / / / vendor --- X ------------ Y cherry-pick will be: main --- A --- B ---- C ---- D' / / vendor --- X ------------ Y as you mention D and D' have the same contents, but D' has only one parent. When searching for unmerged changes commit Y might be reported, but that view of the history won't otherwise cause material issues. If there's another update in the future and it's merged we'll be back to: main --- A --- B ---- C ---- D' --- E / / / / vendor --- X ------------ Y ---- Z In this case Y would no longer get reported as needing to be merged.