cloneLearn/git at master · huhaiming/cloneLearn · GitHub

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
*   [33mcommit 37ed82df102d9a81fa9ff40072466704b0ac388b[m
[31m|[m[32m\[m  Merge: fe7c17e a32c7c5
[31m|[m [32m|[m Author: huhaiming <15611693593@163.com>
[31m|[m [32m|[m Date:   Tue Aug 14 14:43:38 2018 +0800
[31m|[m [32m|[m
[31m|[m [32m|[m     conflict fixed
[31m|[m [32m|[m
[31m|[m * [33mcommit a32c7c5cfeb4f6219fbc805bce7791e7c1fbf2cc[m
[31m|[m [32m|[m Author: huhaiming <15611693593@163.com>
[31m|[m [32m|[m Date:   Tue Aug 14 14:36:54 2018 +0800
[31m|[m [32m|[m
[31m|[m [32m|[m     AND simple
[31m|[m [32m|[m
* [32m|[m [33mcommit fe7c17ed79a0f6f47941331e2048b981c695f3fb[m
[32m|[m[32m/[m  Author: huhaiming <15611693593@163.com>
[32m|[m   Date:   Tue Aug 14 14:38:54 2018 +0800
[32m|[m
[32m|[m       && simple
[32m|[m
* [33mcommit d362a95fc2097acd98ec344f641db48f184d20cf[m
[32m|[m Author: huhaiming <15611693593@163.com>
[32m|[m Date:   Tue Aug 14 14:14:20 2018 +0800
[32m|[m
[32m|[m     update readme.txt
[32m|[m
*   [33mcommit 711fc83f2fa013dcc03062b21f865a736d6f929c[m
[33m|[m[34m\[m  Merge: 5564d5e 3bce6f6
[33m|[m [34m|[m Author: huhaiming <15611693593@163.com>
[33m|[m [34m|[m Date:   Wed Apr 25 18:28:35 2018 +0800
[33m|[m [34m|[m
[33m|[m [34m|[m     merge with no-ff
[33m|[m [34m|[m
[33m|[m * [33mcommit 3bce6f68b7ffe4d9e9d227d5222642a919981508[m
[33m|[m[33m/[m  Author: huhaiming <15611693593@163.com>
[33m|[m   Date:   Wed Apr 25 18:26:36 2018 +0800
[33m|[m
[33m|[m       add merge
[33m|[m
*   [33mcommit 5564d5e930fa9eec58da4bb16929babc5423451c[m
[35m|[m[36m\[m  Merge: 3d4395e e258560
[35m|[m [36m|[m Author: huhaiming <15611693593@163.com>
[35m|[m [36m|[m Date:   Wed Apr 25 18:17:06 2018 +0800
[35m|[m [36m|[m
[35m|[m [36m|[m     conflict fixed
[35m|[m [36m|[m
[35m|[m * [33mcommit e258560d4e87df98570f14345a10fd6803df816d[m
[35m|[m [36m|[m Author: huhaiming <15611693593@163.com>
[35m|[m [36m|[m Date:   Wed Apr 25 18:12:08 2018 +0800
[35m|[m [36m|[m
[35m|[m [36m|[m     AND simple
[35m|[m [36m|[m
* [36m|[m [33mcommit 3d4395e52c20263e3cf9df5b53f7a99f8a6e6dc6[m
[36m|[m[36m/[m  Author: huhaiming <15611693593@163.com>
[36m|[m   Date:   Wed Apr 25 18:14:02 2018 +0800
[36m|[m
[36m|[m       & simple
[36m|[m
* [33mcommit 7778abeda761fea6ea3a273d6bd3321d8fa5c159[m
[36m|[m Author: huhaiming <15611693593@163.com>
[36m|[m Date:   Wed Apr 25 17:50:02 2018 +0800
[36m|[m
[36m|[m     branch test
[36m|[m
* [33mcommit 7e337c7fda5f8c3239a70090e365a0ae48d2d00b[m
  Author: hhm <15679194485@163.com>
  Date:   Mon Apr 23 18:55:36 2018 +0800

      Initial commit