原文 http://sg552.iteye.com/blog/1300713

git cherry-pick. 如何把已經提交的commit, 從一個分支放到另一個分支

實際問題：   在本地 master 分支上做了一個commit ( 38361a68138140827b31b72f8bbfd88b3705d77a ) ， 如何把它放到 本地 old_cc 分支上？ 辦法之一： 使用 cherry-pick.  根據git 文檔：

Apply the changes introduced by some existing commits 

就是對已經存在的commit 進行apply (可以理解為再次提交）簡單用法：

git cherry-pick <commit id>

例如：$ git checkout old_cc$ git cherry-pick 38361a68     # 這個 38361a68 號碼，位于：

 

$ git log 

commit 38361a68138140827b31b72f8bbfd88b3705d77a Author: Siwei Shen <siwei.shen@focusbeijing.com>Date:   Sat Dec 10 00:09:44 2011 +0800

1. 如果順利，就會正常提交。結果：

Finished one cherry-pick.# On branch old_cc# Your branch is ahead of 'origin/old_cc' by 3 commits.

2. 如果在cherry-pick 的過程中出現了沖突

Automatic cherry-pick failed.  After resolving the conflicts,mark the corrected paths with 'git add <paths>' or 'git rm <paths>'and commit the result with:         git commit -c 15a2b6c61927e5aed6718de89ad9dafba939a90b

就跟普通的沖突一樣，手工解決：2.1 $ git status    # 看哪些文件出現沖突

both modified:      app/models/user.rb 

2.2 $ vim app/models/user.rb  # 手動解決它。 2.3 $ git add app/models/user.rb2.4 git commit -c <新的commit號碼>

其他問題解決方案

If you receive an error of fatal: bad revision when trying to cherry-pick commits from a pull request in git you are PRobably missing a reference to upstream.

To cherry-pick commits in a pull request:

BASH CODE git checkout -b otherrepo-master mastergit remote add upstream git://github.com/otherrepo/whatever.gitgit fetch upstreamgit checkout master# find the hash on the pull requestgit cherry-pick abc0123git loggit branch -D otherrepo-mastergit push origin master