Git 将一个分支的commit合并到另一个分支

tangh

1、在提交commit的分支上使用一下命令获取刚刚提交的commit编号： git log --oneline

1. tangh@xy02:/a1/tangh/6762/ZFTY_6765/alps-release-p0.mp1-V5$ git log --oneline
   
2. da75331 solve the camera photo rotated 90 degress
   
3. e6f0984 solve USB cable not recognized</font>
   

复制代码

2、合并到当前分支里面：git cherry-pick e6f0984

1. tangh@xy08:/sdc2/tangh/6762/alps-release-p0.mp1-V5.117$ git cherry-pick e6f0984
   
2. [XY001-V5.117 aa29a3b] solve USB cable not recognized
   
3. Author: yocto-aiv-sct-git01-user <miles.zhang@smart-core.com.cn>
   

复制代码