# Your branch is ahead of 'origin/old_adc' by 3 commits.
如果整个分支要cherry-pick另外一个分支的代码:
1.下载代码
repo init -u ssh://gerrit.ccdomain.com:29418/git/android/platform/manifest--repo-url ssh://gerrit.ccdomain.com:29418/git/android/tools/repo --repo-branchzeusis-stable --no-repo-verify -q -b zs_master -mzeusis/MSM8976_OREO_20171019.xml --reference /home/mirror
repo sync -j16
2.获取log
repo forall -c "echo ==== &&pwd && git log --oneline --since "2017-10-19 13:44""> ~/log.txt
3.切换分支
repo forall -c "git checkout -bmsm8976_oreo_20171019 remotes/zsgit/msm8976_oreo_20171019"
4.cherry-pick
git cherry-pick commit-id(从旧到新进行cherry-pick)
如果有冲突使用gitcherry-pick --abort 记录有冲突的commit-id,发给开发人员,将已cherry-pick的活动push
5.push
git push zsgit HEAD:msm8976_oreo_20171019