Question

In Subversion, it is easy to merge a range of changesets/diffs from a branch using ‘svn merge -r a:b mybranch’. But in git, I found it is only possible to cherry-pick a single commit from a branch to apply that patch to my current working branch. So I am wondering if there is a fast way to apply all the commits in one swoop between two tags in a bugfix branch to my current master branch?

Answer 1

The easiest way to perform the action that you are looking for is with git rebase. Here’s a recipe. Assume that tag A is the commit on top of which the patch series that you want to select is based and that tag B is the commit of the final patch in the series. Also, assume that br is the name of the current branch and the branch where the new patch series should be applied.

# Checkout a new temporary branch at the current location git checkout -b tmp  # Move the br branch to the head of the new patchset git branch -f br B  # Rebase the patchset onto tmp, the old location of br git rebase --onto tmp A br