On 2008.07.24 15:57:03 -0400, Avery Pennarun wrote: > Hi, > > I often find myself being on a branch and wanting to do the equivalent > of a series of cherry-picks from another branch into the current one. > Unfortunately, "git cherry-pick" only does one patch at a time (which > is very tedious), and "git rebase", which is much less tedious to use, > seems to specializing in applying your current branch on top of > another branch, not the other way around. > > Currently I do something like this: > > git checkout -b tmp branch_with_interesting_stuff~5 > git rebase --onto mybranch branch_with_interesting_stuff~15 > git branch -d mybranch > git branch -m tmp mybranch > > But it seems a little complex when what I *really* want to type is > something like: > > git cherry-pick > branch_with_interesting_stuff~15..branch_with_interesting_stuff~5 > > and have it give me a rebase-style UI in case of conflicts, etc. And > of course, even more bonus points if I can get "rebase -i" > functionality. For "rebase -i", this should do: git checkout mybranch git reset --hard interesting_stuff~5 git rebase -i --onto ORIG_HEAD interesting_stuff~5 Not as nice as the format-patch thing but at least it doesn't drop your braches' reflog like your version, and it provides "rebase -i" functionality. Note that the ORIG_HEAD thing might require a recent git version, IIRC there were some patches to make rebase correctly handle that. Björn -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
