git log可以看一个git控制系统的log,而加graph参数可以用“图形”方式看,当然这个图形是用文本字符来展示的。
$git log --graph
* commit 2e7db6fb0b576e9946965ea680e4834ee889c9d8 |\ Merge: 83b0b94 4096d9e | | Author: hirocaster <hohtsuka@gmail.com> | | Date: Sun May 5 16:58:27 2013 +0900 | | | | Merge branch 'fix-B' | | | * commit 4096d9e856995a1aafa982aabb52bfc0da656b74 | | Author: hirocaster <xxx@gmail.com> | | Date: Sun May 5 16:50:31 2013 +0900 | | | | Fix B | | * | commit 83b0b94268675cb715ac6c8a5bc1965938c15f62 |\ \ Merge: fd0cbf0 8a6c8b9 | |/ Author: masterh <xxx@gmail.com> |/| Date: Sun May 5 16:37:57 2013 +0900 | | | | Merge branch 'feature-A' | | | * commit 8a6c8b97c8962cd44afb69c65f26d6e1a6c088d8 |/ Author: masterh <xxx@gmail.com> | Date: Sun May 5 16:22:02 2013 +0900 | | Add feature-A | * commit fd0cbf0d4a25f747230694d95cac1be72d33441d | Author: masterh <xxx@gmail.com> | Date: Sun May 5 16:10:15 2013 +0900 | | Add index | * commit 9f129bae19b2c82fb4e98cde5890e52a6c546922 Author: masterh <xxx@gmail.com> Date: Sun May 5 16:06:49 2013 +0900 First commit
上面代码向我们展示了一个:2个特性分支合并到一个master分支的过程。从下往上看,时间由远及近。最后被合并的是fix-B。于是,AB两个分支都被合并了。