git command tips: branch relation --simplify-by-decoration/merge-base

1. get parent of two branches (merge-base  )

 

[lake@localhost]$ git merge-base   K-51367_20.2_update  master
41XXXXXXXXXXX7
 

 

2. get more detail of two branches (log --graph  --simplify-by-decoration)

 

Example

 

log --graph --decorate --oneline --simplify-by-decoration
 

 

[lhu3@zch127bld08 spice-gtk]$ git logb    remotes/origin/dev     remotes/origin/master
* b1d3942 (HEAD -> dev, origin/dev, origin/HEAD) Update build.bat
*   8168896 Merge branch 'arm_dev' into dev
|\
| * aebdce7 (tag: V4.2-arm) merge dev: 重连X
| * 920c509 (tag: V3.1-arm) Merge branch 'arm_dev' of  
| *   cea9b77 merge from dev, add h2X
| |\
| * \   aceb565 merge from master
| |\ \
| * | | 01c20fc Initial commit
|  / /
| | | * ab1acbc (tag: V4.3, origin/master) Merge branch 'dev' into 'master'
| |_|/
|/| |
* | | ccfc1ea (tag: V4.2) 断链
* | | 2eef97c (tag: V3.1) about dialog置顶
| |/
|/|
* | e2d81b4 (tag: V2.01.01, tag: 3.01.01) 修改ar
|/
* db87e97 move project

2个branch有不同的祖先     01c20fc Initial commit  和  db87e97 move project