有两个分支
# git branch -a
* branchA
branchB
A分支合并B分支单个节点
# git log
commit 6b4f9e1e1a1e1ed3e7ca3a1f15ce1f8a9b2ee0b8
Author: zhangsan <zhangsan@qq.com>
Date: Tue Sep 25 11:53:42 2018 +0800
测试1备注
commit c75b60957e0867d317cc783943519662824d42f4
Author: zhangsan <zhangsan@qq.com>
Date: Thu Sep 20 17:26:04 2018 +0800
测试2备注
合并
# git cherry-pick c75b60957e0867d317cc783943519662824d42f4