git_branch_log_graph

最近在学习git，在看到git分支管理的时候，感觉是时候记录笔记了，在这里也就不写笔记的具体内容了，有3张图，如果这3张图看明白的话，那么也就没有看笔记的必要了，好了，不费话了。

说明：在主分支master上创建了1个分支名为dev，然后在dev分支上又创建了一个分支pre_test，然后在pre_test上又建了一个test分支

问题：请说明下面3张图，笔者到底进行了那些操作，当然从git log中也看不到太详细的情况，大概说明一下就可，不必较真:D

下面的图片命名都是按照操作顺序的

git_1.jpg

git_2.jpg

git_3.jpg

Log的相关信息

# git log --pretty=oneline

febaffb04e0087cc0d76080297e34d2adccfee7f merge aa to master, and then delete the branch aa
abb774d184de930fab4c6af802eb3554c33bce8d merge branch bb to aa, then delete the branch bb
724f83f29a3acbf751d19a98f7b1c3041a3db07f merged bb_1 sub_branch with bb.
86a332b4ee67f6b5d2303ad00dbf5a95bf3f74b0 delete some test files.
f1ee506251ab828b4898e1162fec4e43cab8d276 add new file too, name with bb_1
dcd2ef0e598e8ebb44599c2da81e46c294c8c047 add new file bb_1 on branch bb
4fe6d9f913a629a5c36598aa12ec58bea7528154 merged bb to aa used --no--ff option.
49afa719708b9df55fe4bdd57a99b9e406b73a0e add some message.
0299300e77ac6369325be31a21dda23bae90acd8 bb
47d49fa5ce10ed2aac9f945187418ed85d18500c aa
cd461c922685e3d50475fa31fd4d511899fb722d used the opotion -a with commit operation
1cb507e61f9f3522932d109b475ee48944f2d772 create a new branch named by b, and add a new file b.txt
2074e89e3c21039fd0a0b197abeaa166483702e8 create a new file on branch a
d735fa47c53d63cffdd2547a3a030ec2b149f861 add two files on dev branch
56e017fc00a0a61dbbc1620c397a821ccd0a81c1 bug branch update
ade008ba03b7a03eebce70a16c609a25c0c2e442 bug branch is studies.
21a18306b31bd8d04a31387f85f43f49cc3b8fe6 merged bug fix 101
250adce95442ac5bc6af3a44d6a9129f928f6703 fixed bug 101
5c005e3d580fa7840f952757a7fe6dfa5779430e exchanged the readme.md file
0f5d094c3e1b5df6f166990e5f39409b7cf0d688 merge with no-ff option
73d0d152bca5d2f4bcc4b4fb9336661adf6e1052 merge with no-ff
ff283ad008e9427bd6d41a01223c2562ee6c6d2c conflict fixed
90391ed919d2ffe6a91b978016b6cbad587c45e0 only see first line and changed and to AND
85e5c2b7d06c89899b4142dbdbfd75c43b01c061 changed laster line by master
346f2887638493e778f6131a4f276bd71d5b4d03 Merge branch 'feature1'
c199b85960434632fe28d1a96851baef5ffdaa4e add some lines.
1a458a134ecbffb6326ec69d237ad86bffe62363 feature1 delete some lines.
2c3e1ace11b7f5702541df2518e29717ad9f15f7 & simple
12412c9a28d6337fd2ddf23eb827f3aea9f24e6b AND simple
77fec30cb00b66d6f1bf08bcb112ade72f2fc600 conflict fixed
3b521d13c93ac321812ae54313aec8ac0ab1cbb8 dev branch changed this file too.
a3d7b2818cc101e4f2bb60cd369daf22c88c9dc2 delete some network interface.
3393a30ed11a5b53cacb329acf6c2c13fb94d116 This file is created by dev branch.
7861b3f4f6c28d5e995f16a9324069cf08ce0f64 add some file 2_create_merge_branch.md
ccafc5f8440200027ed991a636626489780e79cf create a new branch name is dev
ad3131b2660cdd468b629ccb1a22586746a7cff1 commit remark as a backup
79e13834addd07213cb578a9a1f44c107f2a7966 2016-08-04 first commit and push to the remote repositories.

下面是最后一次的Log的详细信息

*   febaffb merge aa to master, and then delete the branch aa
|\  
| *   abb774d merge branch bb to aa, then delete the branch bb
| |\  
| | *   724f83f merged bb_1 sub_branch with bb.
| | |\  
| | | * 86a332b delete some test files.
| | |/  
| * |   f1ee506 add new file too, name with bb_1
| |\ \  
| | |/  
| | * dcd2ef0 add new file bb_1 on branch bb
| * |   4fe6d9f merged bb to aa used --no--ff option.
| |\ \  
| | |/  
| | * 49afa71 add some message.
| | * 0299300 bb
| |/  
| * 47d49fa aa
|/  
* cd461c9 used the opotion -a with commit operation
* 1cb507e create a new branch named by b, and add a new file b.txt
* 2074e89 create a new file on branch a
* d735fa4 add two files on dev branch
* 56e017f bug branch update
* ade008b bug branch is studies.
*   21a1830 merged bug fix 101
|\  
| * 250adce fixed bug 101
|/  
* 5c005e3 exchanged the readme.md file
*   0f5d094 merge with no-ff option
|\  
| * 73d0d15 merge with no-ff
|/ 
*   ff283ad conflict fixed
|\  
| * 90391ed only see first line and changed and to AND
* | 85e5c2b changed laster line by master
* |   346f288 Merge branch 'feature1'
|\ \  
| |/  
| * 1a458a1 feature1 delete some lines.
* | c199b85 add some lines.
|/  
* 2c3e1ac & simple
* 12412c9 AND simple
*   77fec30 conflict fixed
|\  
| * 3b521d1 dev branch changed this file too.
* | a3d7b28 delete some network interface.
|/  
* 3393a30 This file is created by dev branch.
* 7861b3f add some file 2_create_merge_branch.md
* ccafc5f create a new branch name is dev
* ad3131b commit remark as a backup
* 79e1383 2016-08-04 first commit and push to the remote repositories.
(END)