On 2008.11.05 22:24:37 -0500, Deskin Miller wrote: > On Thu, Nov 06, 2008 at 11:45:27AM +0900, Miles Bader wrote: > > Is there any easy way to cherry pick a _range_ of commits from some other > > branch to the current branch, instead of just one? > > > > I thought maybe git-rebase could be coerced to do this somehow, but I > > couldn't figure a way. > > Rebase is exactly what you want. Given something like this: > > o--o--o--A--B--C--o--o--X > \ > o--o--D > > where you want A, B, C to go on top of D: > > $ git checkout -b newbranch C > $ git rebase --onto D ^A That should be A^ ;-) > newbranch will have <...> --D--A--B--C ... and then you can merge newbranch into the existing branch that references D, fast-forwarding the branch. And then newbranch can be deleted. If you don't want to use a temporary branch, you can also do (while on the branch onto which you want to cherry-pick): git reset --hard C git rebase --onto ORIG_HEAD A^ Which should get you the same result, without using a temporary branch. 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
