git 查看分支合并情况
git log --graph --pretty=oneline
效果如下：
* 56d9291f54ba5316e472a113cc8f5d4955474d19 conflict fixed
|
| * b08e10d17625ee7a47a00ddc22e726522122534f add simple
* | cfd23efdab6f561194200b089397fc41d090063c *&simple
|/
* b70c723055b8b5f2f26e12e34718670cd2fee6c3 delete fiel
* 638e286cabae22d4bba8595489acfb50d993b85f add test file
* 14c4587d6e867112e9c217d96a1b9b6d3f2f8612 *update
* 77f12b11283287318131e8b292287c8431d91123 *test
* 11951f8dff87029f1af79c8c89109e26bd1325a1 *test123
* 22cdf6589f20ad0ed3d6eb388d2cdb45cb7394cb add file to this branch
* 01b359d09aff811160953f87ccb43e044beb6f28 *update
* e613524a9be9062c130dfa4dbb5c717c6f4d3c0c *add readme.md file