From: Thomas Adam Date: Sat, 14 Apr 2012 19:36:13 GMT Subject: Re: Merging changes from branches where file paths have changed Message-ID: In-Reply-To: <4F89CE36.4000607@kdbg.org> Hello, On 14 April 2012 20:21, Johannes Sixt wrote: > You have these histories > > >  A--o--B--C--o--o--D--o--E   <- RepoA > >  A'----B'-C'                 <- RepoB > > and you want to cherry-pick D and E to RepoB. Right? Yes, that's about right. > I suggest that you install a graft in RepoB, then cherry-pick D and E: > >  echo $(git rev-parse C' C) >> .git/info/grafts Can you elaborate on this a little more please? Or point me towards some documentation. Note that due to the way git-filter-branch works, although the history between RepoA and RepoB are common, the commit IDs between the two are completely different; presumably git-filter-branch uses patch-id at some level to reform commits. Nevertheless, if I'm understanding superficially what this graft is supposed to do, I do not see how getting a list of commits from C' to C is going to help in repoB when neither RepoA or RepoB have any ancestry in common? Kindly, -- Thomas Adam