git cherry-pick to another branch

git branch cherry-pick
kassak picture kassak · Dec 14, 2012 · Viewed 8.1k times · Source

I wonder if there is the way to copy one commit to another branch without checking out that branch.

For example, I have two branches: master and parallel_version.

I'm on parallel_version branch and I found a bug in file common for these branches.

I've fixed it and committed. How to duplicate this commit to another branch, assuming I'm using git-svn?

Normally I would do:

$ git checkout master
$ git cherry-pick parallel_version
$ git checkout parallel_version

Is there better way of doing that?

Answer

ThiefMaster picture ThiefMaster · Dec 14, 2012

That's not possible - simply imagine what would happen if there was a conflict that couldn't be resolved automatically. For the same reason you also can't update branches that are not currently checked-out (even if a fast-forward was possible).

Related questions

How do I split up a large Git branch into lots of smaller branches?

I have imported from SVN into Git, now I have one big branch, like this: work on feature C work on feature B work on feature C work on feature C work on feature B work on feature A I …

Read More
Git fetch remote branch

My colleague and I are working on the same repository. We've branched it into two branches, each technically for different projects, but they have similarities, so we'll sometimes want to commit back to the *master from the branch. However, I …

Read More
How to remove local (untracked) files from the current Git working tree

How do you delete untracked local files from your current working tree?

Read More