git cherry-pick

来源：互联网发布：淘宝vip等级怎么没了编辑：程序博客网时间：2024/04/30 06:54

git cherry-pick用于把另一个本地分支的commit修改应用到当前分支

pateo@pateo-B86N53X:/work/project/C3001H_turquoise_3.10/build$ git logcommit b9b80ae5cb7909578dc32564324e3480244d87dcAuthor: jianguoliao <jianguoliao@pateo.com.cn>Date:   Thu Oct 18 15:48:47 2012 +0800     Remove iVoka Video Files From Update Package        Change-Id: Ibc9aa7153992708678e6600285e25bdc3c03e2b8commit b5786d447d78767d593aad47cf8e2f794990478eAuthor: wlf <lifangwang@pateo.com.cn>Date:   Thu Aug 23 14:32:33 2012 +0800    script: the AssertProject is logically wrong        the wrong logical cause project assertion of a1030 is wrong and can't update        Change-Id: I995e35cc07a589c6d6f55e8a1be5ff14ca2fbb5b

pateo@pateo-B86N53X:/work/project/C3001H_turquoise_3.10/build$ git logcommit b5786d447d78767d593aad47cf8e2f794990478eAuthor: wlf <lifangwang@pateo.com.cn>Date:   Thu Aug 23 14:32:33 2012 +0800    script: the AssertProject is logically wrong        the wrong logical cause project assertion of a1030 is wrong and can't update        Change-Id: I995e35cc07a589c6d6f55e8a1be5ff14ca2fbb5b

pateo@pateo-B86N53X:/work/project/C3001H_turquoise_3.10/build$ git reset b5786d447d78767d593aad47cf8e2f794990478e --hardHEAD is now at b5786d4 script: the AssertProject is logically wrongpateo@pateo-B86N53X:/work/project/C3001H_turquoise_3.10/build$ git pull

pateo@pateo-B86N53X:/work/project/C3001H_turquoise_3.10/build$ git cherry-pick b9b80ae5cb7909578dc32564324e3480244d87dcFinished one cherry-pick.[turquoise_3.10 b2da2ff]  Remove iVoka Video Files From Update Package 2 files changed, 4 insertions(+), 4 deletions(-)pateo@pateo-B86N53X:/work/project/C3001H_turquoise_3.10/build$ git logcommit b2da2ffde55859295fc13f0beaefbeff6f92177aAuthor: jianguoliao <jianguoliao@pateo.com.cn>Date:   Thu Oct 18 15:48:47 2012 +0800     Remove iVoka Video Files From Update Package        Change-Id: Ibc9aa7153992708678e6600285e25bdc3c03e2b8commit b5786d447d78767d593aad47cf8e2f794990478e