git-log

c32f807721180e69edfc3c935e3afa7895e2912c change git-config
2c0bac85a09c7ed696819dea6df19a5b4dc31737 add news
f01f66935ece232afacacab8da7a4360f9cff8cd Modify git-who file
dffeda95cc9b7a8a30aeff2079448f98ac06870a Add a command that who changed the fifth line of foo on develop branch
a60bdd77788caaafe6bd8f1cc41c65d24caf6940 Add a news
08901e2858902701cf49df8226bd702819b41c58 add author info
d12cba78a0d4e1dae54211f1c021916465fb778c add find the 5th line author command
99bc8bf6e9161ff62b03cc0006664aa10656ae0c add news
92b26a1f1bda07d1d3633d25deb184ce9a4c7657 test git flow feature
1d876342fbfe510c14f46bd043b17686b5f5f276 add my name
c4e3c7e5190d6623fc6fd75afc451b3e4a4f7575 find the one who modified line 5 in foo
70dd84939475ff1f48f50d967cd6096463e04d9e delete a file
cc86509996b6bcfadeec86c0faa35761e0c6f8fe add a new file
aa304e68ecaa14c2846caf0e335824a9e2b9c36d exercise 2
075acb76fb6a7962c5783cec1a66094eb0d961cb resotre correct content for git-who
7d339c63f00ad7d2bebcbbb2aef1b958cf992005 cherry pick step 5 and 6 in practise 3 from branch tangchang:     b96529a awk '{print $0"#@tangchang"}' git-who  > git-who-temp && mv git-who-temp     7d66d29 the fifth line in branch develop was changed by who?
86648c188c3ec51c4fdd41a1ed69be121bc5f01e modified the fifth line in foo on develop
36cc3dd9e508dedf3236a2bc74965c60fd80bdd9 Merge branch 'feature/two' into develop
f25c0a8952666c76644104e6755d93e59342acee feature/two second commit
7758078d437a13e024f5b083244e3b935ab54977 feature/two first commit
d656f2748a82d506cb38a778c0594c40f76d74d5 feature/one
87587801f4db01df3d63760f0e21426ed731bae8 Merge branch 'develop' of github.com:admaster/git-test into develop
aa9176e02e5f47cf8d4e823c9d0dee60a8f155df add author
3b9a9f5246730fdad3d1a28b452f4875a6e13d5e add a command
12ff307b3652b7efd9eb63e49a77f5be8a26e72b add #@tangchang at end of line.
a00c88cc2ca9118f2766bda84e1d5faede4e16e4 git blame practise
09e342b9a61e22fbd115c6d1c63322a831e95ef6 Merge branch 'develop' of github.com:admaster/git-test into develop
7cc2111877d9519a54fb013695fd23433245f702 add author
0acfd12047032c4d5c754b0f39a0e34954c57655 处理冲突
62ed91139b6a95eb41cef701b3b37c7bbb6f4ac4 change file
c67f572b58ca139c708d0de9cb211e586ba9fc75 modified git-rocks in feature/git-second
282eb651027d9739aecf17c8a64a7f53b346b967 update file again
9dad4957c356197d05550d434e51d94ed18ce1d1 wenhaiwen change git-who again
17bc2a50a556b665d574c9b3dc4feb88b22e8668 wenhaiwen add git-rocks again
fef602864f0ad2e29910227c3bfc926e10ad925a Merge remote-tracking branch 'origin/develop' into develop
e1ad8ae2a072d949e1f552630aa8645000b64947 wenhaiwen chang foo
a88dbe1ebb3a6e149fe4f54bf046082b8d3db120 update wenhaiwen branch's git-who file
f03ee64d81f5c03a9d3bb6fb06fbeeb423d3aa75 add some info from the file of develop branch
c0b823747049ae3c78b80ac3ea352d48fbe1c744 add a news
ba7d709974812b59cb8f3d84bcf884d8c4fd85a9 Merge remote-tracking branch 'origin/develop' into develop
fa1e6c139cd9881bfea03deb580b0b38b44adcde change foo file for a test
ac2f818976345fc8b6eb7aa4a99245363936c9aa =wnaghan's git-who
990b95a55edc04af30ae5a020d933ef14d40ecac =wnaghan's git-who
9d76531755eb63f30931a1c7d0b099fa160ede05 =wanghan's git-who
9a159137ad0e96feff18698a77a5911ad4da30de wanghan's git-rocks
640c4104a38e57992094d4f4373dc3acfb70a36b Merge branch 'develop' of github.com:admaster/git-test into develop
c71e5839bc6152ca7c31c36618978fb244c4aaea wanghan's foo
78ec45f7f69a6e3806e99ed37731f8b02e69c9a1 update .gitignore filter ~*
6b4001245fba2bde442a7a2a551a93cd24030ba9 .gitignore filter ~*
51821d795955d53adf6b46e0f9ea55b8123780ea =for vi git-who add #@lvguiqiang
17b54d39d342dd3c5f1e5b9d4e849efcf1b88b26 =for git blame -L 5,5 -s foo develop >git-who
2a57a321ddcf9f758b8957f01f1c54ee233d3737 =for vi git-who add #@lvguiqiang
27c63dab5f3e65a757f5721d182045d0e47717b1 =init
74aa51af62e9c674b10e544e13b0a156ca1d86b9 =fot git-who foo 5L
df558033c5972393e5484e686130284c000d44ae =for log oneline
34be4151bf4a154dbfb292d80f4b2abd0032f0ea =for foo 5L
7d32ec7fcb6f20ff0ccb495c85777c4121046c48 for merge
3d7f216c96b9b7c220395735f4b5ada115faa4e3 modified git-log
22f14534ed6440b8c91cb63815be352753ea346b Merge branch 'lvguiqiang' into develop
453df6609ae580cfbac987500c5ab78efe677fc1 for rebase
b7b094849860329fadceae041471312e0a6a391d for rebase
9afa45e5f2ef8aea38e3b27fe32be47fc962de18 Merge branch 'lvguiqiang' into develop
c1e8fe510259b674f5aefbed7642aca26a179422 .gitignore
ac79304ef82ca90f01f9507f411805cd45ba1f58 gitignore git-log
b3bb25b35c6aa0f0eb52e143f683818cc9dd01de for gitignore
c132470183a8a43f5279343cbffc9dc8661e2e90 for git-log
87c7402c79320ee2c226f6a17cafc39801e28ae6 for gitignore
32612c73d7ec1a0fccad3530263af0b361b23663 for commit
5813822903ae9e3544cd4cf54f8e9ad36bb01386 update git-who
76900796e76ac9701a24762c5779d8bd6a231057 for update git who add autor
0e157379c4d7df423dc1c01812968b029b37f659 for update git who add autor
6568b70644e97ed53201b0989a14cb0080764ed0 update git who
b01c30fdb41b4fc9f1f87540323ef6c014a57581 for git-who
228bb1afbbd1454e24be045616b576a3e3d4d924 for update log oneline
9a79e7efc7cc31f08e3985ec64420776a96868f9 for update log oneline
634dfa8105a2231a32aae7e73a59b72dfae94a10 update
9fd6b95a9cc7542060c36f0d100aceaed602f44d for add
06e40c11c8920d45a9c797de81b21ad1e26801f4 git-who
879cc305e246b17fd45bf75a05e46b1620563720 git-who
ea06b0e140ff51cc830097ee6c40addeb35c14d1 Merge branch 'feature/xiongtingting' into develop
48b5b0edb32885a021024890eff3bf7eca90a099 git-who is committed
fa598dbb75605214d5603a76f1116edeeac22f34 git-log is committed by xiongtingting
3631ce45f01ae8fa42e4daa00c24a0b6f3e73965 beijinjiangyu
b7e75d8c0023a0a847271cff58a3c818b0536738 Merge branch 'develop' of github.com:admaster/git-test into develop
581634020d02f960b1874806a77ee7283cd9ae5b git-rocks is committed by Candy Cong
44a8722355604a675031cb38b3f6023cc9c77999 Merge branch 'develop' of github.com:admaster/git-test into develop
940fda91471e7ee0caaaa21aac7521e9b445fd9d git-second committed by Candy Cong
1397312afab528ce558ce29a461b9355ce60e75d git-rocks
84460f5039099e67263a1d8c4a6db391145e383b add new file
ecb7c1e4d3f4aa1202fb473d92727b48ed424f8b renew the commit
69f96c631ae113e0e1a7e4d14e130d3435573e41 new feature
678aea18746ede3833c372a7cfb38583f477a0e2 add a file
1d8d2940d9ec4f271871a80705f8d6ddcf866976 edit git-who file
a9f363be1e1c4f6f6e64ea6d6885e2ccd7dd8aa9 add my name to git-who file
eefc67075dc52b82ce63bc63c557d9b389fe0134 add a file named git-who
8bc2b3cc67366220173b46958cb3c267fb98cb63 Add a new file named git-rocks
370455ce6d7bd71571d6b0ce6425a50dbfba7842 Merge branch 'develop' of github.com:admaster/git-test into develop
fbe81a572ec4928e868a1cad82055a0e428baf54 conflict resolved
e4c2d32f0097ca91c3a68b347fde1d309cac7b9b test-file
aebab2f2b3b08217fe79c075c8e2a7347e872dc8 resolve conflict
dddbfe5e2c333e121017965a94455064b3564c79 save git-log
1455556bf92d3ed059b35f24d333626ab6fb0e70 add a new file 'git-config' by CC
19e32cdd51bc7582d612add4fd68233aef4a8b3e CC's new feature comes
dec83cae52099e466c2832250bc6e2146dd0dd00 develop merging
0ac2a07c1c84f761cea81fcd9e31893105b9959a git flow init
3ab5e61f79e7672a09bf6e5bdb527823ca9f146c stone submit
bd3be676628e05893466ec21f16a5a5ab32e0c4a abc
e9569b4597d651594cdfd659b6cc643e3cedf96a abcde
95d83a50f9ada75996bc86e80166b900f7f2c7a4 trim foo
5777aeff49d286d63acea9b181da66d7501b9e95 again
60bd5d6e8a60c178f86de8801b42dc945c32dfb2 by idol
14dadf134f3cea0b2ec6ddf74a0930760695449d Modified again by Candy Cong
799d2044068367e38e842c3bca36c47c8861b884 foo
d5d487f28f876638f132b38fd5c09c795ba6bf78 Merge branch 'master' of github.com:admaster/git-test
1ece876d37b7799552b6d07c98b589c0ea5ca443 testing four
289f887a8e9bb88f3ff5f35cbb4a5e383c24aa3b commit three
7f1495eb05e51acc49534d2d8d994f65bafde519 remove some blank lines
3779fd47636e6abfa95fd71ce193836cbbcffba5 commit two file
42451fd34f82a1323a58bd0ac12c761af9add42b commit file foo
0ebc24d63a7c8d064c2adc3fe22a1ff24442a04a Signed-off-by: Larry Lv <lvguiqiang@admaster.com.cn>
a33f6cc8a5fd94b224ee0a159f7bcc6960ea3334 Merge branch 'master' of github.com:admaster/git-test
4b41deef6f35d0b089eb33a787358a9c5eef4682 merged
cdd987e7e56660dd876f32d6268a85571da802b5 edited by idol
e6037aac0a5ba98e1627024ea42de6b8161219fe foo file set
6b0df9c5fc9f504d97c1a93ac8068875b2b399bd xtt2
e1ee905cf65d3a1fc928e47ed57fa710b688acbb xtt
f209b2a46ed72dae19a482ef52c784c25f1e116d foo modified by Candy Cong
4ace0c21d29a76a1cb5d6274d2b3459d21809c0b Signed-off-by: larry <lvguiqiang@admaster.com.cn>
6672eef21e5d3da6c7cfd59143076f6cd3c9808a foo edited by Candy Cong
c9b3f3b7b006036af1974ae308405956f6b2f965 commit
bfebe51a44d55be995c8455144c053be5fdad280 XieChao commit hahaha
d66af3dc0cf7468f5f8687a184addeca04b012a2 first commit
184edebfa14bc5daa0fb3723aaea885992d010ff CC's first test in GIT world
1fee3937c2b7fb40c84838a52c9802449b80ec4f foo edited by mars
1e6ad8f80c52ae8d79d693a66307a12f3633b1e9 Merge branch 'feature/zyptest' into develop
c12972c20bb5ed68c392c6b6c48082e6fa30b427 小修改
38ced0fafb3f1dcdc6e3b3ece0dfeb07ae7da3cd new line
25e53db2cecfdde0648f3870ebe11f421319b7cc Merge branch 'develop' of github.com:admaster/git-test into develop
f001f2c020f78c3facd21a0b85836b4bf6509432 modify git-who 去掉失误的修改
37b357259cd95adc329fe383e052b71761a37478 Merge branch 'develop' of github.com:admaster/git-test into develop
761650f3f27917eedb5bd2a34cd00dad28ec12e4 Merge branch 'develop' of github.com:admaster/git-test into develop
931af59d49de480544a6ee0f504c1389692589f5 解决冲突
9abdd5eb120647067ad6b6668656afe590fe4fce rm git-log by gjy
fd47207471fff99163691c0f2b9838afc16d58ee 重新cherery-pick
36024eee3f133d461a273a28c8907f642777efd5 Merge branch 'develop' of github.com:admaster/git-test into develop
2afc17964973dd1b047d34e103efcf2c31f0716d 删除测试文件
68a8bb78d43d1557c6ee0583e9e73fbfb3470408 Merged conflict
13a033f909f967adaf4c14fc02a40d89d1ea3b6c Added committer who changed responding line
2abc6e90c214197c1a000e544219c4379eb08893 Added command statement to find who changed line 5 of foo
8d8e492002c4340093efad6064489c60aba545fb 解决pull 的冲突
b897b1b19c211dfbdc4d885470d6c69e1d8eef09 合并 git-who
f52185e6cd4b0e9b2199d4de41101c5a469150c8 Merge branch 'develop' of github.com:admaster/git-test into develop
236fc3480daded1c0f4db2ccb75c714a5af9d420 blame 参数没有空格
50235bcd7cfa01a726ddcaebcf36103e93eea98a rm feature01
0cc66ed2626d51ea0ae20366522acf90af1895d3 test feature01
046f7d070efffb193f629755477d7406beb26f9e Merge branch 'develop' of github.com:admaster/git-test into develop
794b2ebc09efa2daa00a8ce7378075b06fb7991a submit modify git-who
f3a9eef25800d2c07d4f62e460c26465319ca847 Merge branch 'develop' of github.com:admaster/git-test into develop
a2c2ce53d747b3c94a5cf43a96a6e90a76ddef68 Merge branch 'develop' of github.com:admaster/git-test into develop
a3983f778fbae8c803ba968c01647c6f8d9b406d cherry-pick 冲突
a3686b9587e25f79942797c60c839c272d6449df 再一次解决冲突in zhangjx
1c3a2a8d7ad5a5170f417f10562bdd45424c59fb 解决冲突in git-config
255dfd549449437cc836868eb953db1414c14a78 解决冲突
ea18fcf43062c419396311b0edbddaa1d1f09968 Merge branch 'develop' of github.com:admaster/git-test into develop
ef77aba6e799ab26f844244a365c686b979f401b Comments from Hudie
5c92f2d288224c5bb7aa4ac1d048636c5ac26fbd 处理冲突
52b12b78bd72c68667628de291523968991c0594 merge two times in zhangjx
4616a1234c69a649e327985b1db3e6d3b56f69d6 解决冲突
33d4dbc832bdd527c48ac7c73b9288334f79d4ce 解决pull develop冲突
3901e981761c41d81e7f80df3c75bc01d119ab41 Merge branch 'develop' of github.com:admaster/git-test into develop
5e17e719c1b149d7f0b00299bc90776b1198a160 处理冲突
8b67a1a208f1a8f807995f1651a1d13f93d68c75 合并个人分区文件到develop分区
0184a1fc2c6103b58f3a94a66f606b9bce3cae62 add git-who (cherry picked from commit ab5736c6ba00d1f7d6c0366a33125ab9cd802fa1)
2775470559828e11d001829e6838390d9abd021b edit #@gongjingying
cc6bd1cb2fc44fae63c284238a78ed91488ed0e4 merge git-who in zhangjx
321c173d4aefefdf38a0482f47e13fb9bd790453 Merge branch 'develop' of github.com:admaster/git-test into develop
e8947e2dd77b38895b983b2e63bce859c4672605 Merge branch 'develop' of github.com:admaster/git-test into develop
4d12c372b9d38f6cfc12712baf2f492188f095bd merge from master
566f66a6c6b011932f3e3499f619d01047eb37ff 把blame结果换成语句
4729f5ff68a97a3028ed563d82a59b952deef3d7 Merge branch 'master' of github.com:admaster/git-test
603a43d5a59c5b2fcffeaa4255b448e181a31005 change 5th line of foo
b40a5d6458472fcf8e7a3cc543ef0ce9d1cf6778 解决冲突
3abc782f7a567a4d3f5b930dcfca74a7aa46c5fa Merge branch 'develop' of github.com:admaster/git-test into develop
54662f2311c19d77150b6afb640153fe1f2934d7 merge git-who in zhangjx
57ddabd2bc64f77769c611a16c3724f160c3acf8 添加查询行修改命令
98c88f87207b338ab22c95bf4f0c92e88a848e65 git-who conflict solvd by gjy
db8d905336ac6598ff2d14ccc2f48e62d93eb0d7 amend exercise 3 with tech review required
c7ca2c18112b058c1946581139155fea5e62b5a5 Merge branch 'tmp' into develop。日，我特么容易么我！
884fa0228661735146f86f34abf803f0c86bdf33 打补丁
24ed595e9954d190198e9046b8a8148fe8bd2280 make a mark at the end of the only line
bed3dc13ba7e7a54020fd722d17184d66f89236d annotate vs blame
64b24f64aef4fe22062ae30393b7471cdf7098d4 change again
d6dd10bbc3a59a65d33db0a6cc5b1eb8df447af8 prepare to push
ce018b6d694a9844c02a4afc9e51c787d9da34f9 change
7eaf57d348c47cd1f4f368787d2e05d36e83b6cc 丢了#@zhaoyupei
33a3be317e06eb4c78bb5dcce97ed6eb56624011 解决冲突，发现新问题
289c8161566010ac69571ef6fa6af6238c7f646e add git-who
58fa9289a61af075fcd8d639fe7f2dcda9d97b97 modify git-who in zhangjx
95e65b03a446ebd51220b4a055fc95238aa69cf6 重新cherry-pick git who文件
9cbc27e65adf19a68932676e513eb130e742d3fe edit again again
31d14c37868e68f0b3c45f24f19af33742f0f86d 重新修改git-who
4f15ebd5f869c90cec11b716dec8f5207ce8c8b7 git who conflict
b02a1329461e15f2b2cff5b2adc8637c8c169211 重新修改git-who
8e491bb7b13ed0e9a4b47048659eb9225d6bbf46 修改git who 之前的内容错了
5e05db55751dd46dc04f05ac1eb0c36bcf3165d4 apply develop
e7ecc8f21b06cd80770962db472e9ed82c8d3567 解决冲突，合并zhaoyupei分支下的git-who
6a08437239b73a39e6ab2585c8c76f8a988d83f4 edit git-who
ade39762ecf069a0818c6c7f77368a09916537c8 Merge branch 'sunhaoyan' of github.com:admaster/git-test into develop
f8ed2e47f5ae873e659a27c2613d3c9eadd61160 添加git-who文件
4167ef54461bfffe4b54213c13edb9d426652edf gongjingying added #@[gongjingying] at the end of every line
1f4f69695dadc70289e594e6c7771b300118da47 commit the git-who
84c6bf00f471ff2275642ffceaa74d535c6086a6 再一次解决冲突
fd34e6a59ae757a7de947a966165ae01d10c738c add #@sunhaoyan
78e5d77e0505d90a2abe9f7983a60a6e11a81c47 add file git-who
8c05006ea41494f05edf03c158f9e4c744be9721 add #@sunhaoyan
1cac677fb14690aaca101cdbfc179cc880c4a995 add file git-who
a3426403fd7630af131bdc0e76c6548a94609f07 rm local file git-config,which is not in master branch
fa8308dbb3e7d54fc7ffcceeefbd6bdeada44357 confilict with local file, commit again
fc6c654efbd809d095df9e8f6f9a682c1e2def6f 3 files modified, i need commit!
7ed8fd71f1e8926b52196dc7dd9e0fda657bddca add file git-log
12b0e60cb7ecb4660e44ebc606fd4861833505dc 添加git-log文件，记录tonsh的本地develop分支log
da196820f4f670ef153ac3a59617725817378e8b process conflict
97ba3647262b5b230a8dbb4b51c087297ca9b8ba conflict again gjy solved
e4151ecb0cea815fde5d91bcd90d79ceed877b8a merge origin
9e8f83e86e7f5674235b9a5ccfef7a1db4ad731f 解决master分支冲突
c0ffb9eeb648f9a3d95d9ed1b670a22b7f9924e3 解决develop 下foo文件冲突
5ada5cd4a8c9cabde197c1b331775c9830eb35cb 解决冲突
de304b7b2c9327e448b46519ceaf26ec91b4f80c 解决foo文件冲突
7cd5a5c94951ddace7124ed39b9852fe3f60a980 merge from master
268bb25751b5c58e5803b64fe1885e54f8297772 add exercise 3
9e2c41b94db941c5c8b5ef4f28722e35b66cd45b Merge branch 'develop' of github.com:admaster/git-test into develop
85433f5a5f0542ed49fc816ad0929d6909557873 Merge branch 'feature/demo' into develop
333eb0e43aff29b024fac47f5a2d13ea50e378c5 yet another line for non fast forward
75a75babc9ee67fd1601a3f415a92e67de52308c try to non-fast-forward
f0d8d22177558a7f92d04b6f10c1b3aff3754dba Merge branch 'develop' of github.com:admaster/git-test into develop
716e7763c0d6da44c9f7abea26f9144ec38a00b3 gongjingying's git conifg
08dd6743b4bbc7dd947a14c92862d6e5c1242d80 Merge branch 'develop', remote branch 'origin/develop' into develop
cf0f73d70a5bffdf8a027596497b92b0019228d1 添加了一条新闻记录
2e8b047bd0c121c8d6341111aab76135ed416254 Merge branch 'git-second'
46cb9de4b597b8f425a98856d78bdabe4721f311 gongjingying add news on git-second
609ed50316706c826979f46830ba865728ddfb60 Merge branch 'develop' of github.com:admaster/git-test into develop
f2b10c16e68942a359d6ed274e8d6a5e27c1ecba process conflicts
de585add9a4ef819879a66269d4657b0a966d289 合并代码
3943705817744c4abb965954af03d2cebe6fcc12 添加新闻文件
4d444171a41052cdda568a1d3de6a99cc10e66de add a big news
3f3b68d101566fdfd98e189ea7b55a0cc31632af important notice
f31be0c6da8a5e500341f3d43f1f29389f9e9500 merge from peter
ec07f183f5aa3542b9a690d214c933c52d2b1396 Merge branch 'develop' of github.com:admaster/git-test into develop
396eb4084c7124384cdd8cd55319d4576df6d39f Merge branch 'develop' of github.com:admaster/git-test into develop
99c1a59e70485868d740f584b3650f7604cf7c8c Merge remote branch 'origin/develop' into develop
3a4cf5b6ac42b158eaee573f9cbe154b16661eec Merge from master
8f0fee6a1bce723e1facba6c9f263bb5a0d810b2 做个测试
cbcefbf71beeccf736e6bd07e6f2bef7c5c67f86 Merge branch 'develop' of github.com:admaster/git-test into develop
b9ffa083da5530c00247dc3cddc26433040652e6 误操作删除的文件，恢复
8e82325cdcb13040edcc3837eea5a7f64648f6ad add one line
89a88add7856f733b5bc45bfa4da43e63739adf8 add message
29481a697418593d3846f2821ec090972cecde80 Merge branch 'develop' of github.com:admaster/git-test into develop
c34bc32ea1f8b5059c21e9163c5561f0f4a1de14 Merge branch 'develop' of github.com:admaster/git-test into develop
f518bcd4978715e78bbb0bf162474ffdc4c50a42 merge keyi
29e547da702334454104394038533c4574bf01f5 merge
0041a855e7a553fbdaebb542f97703681cd207f6 换一句slogan.
01184b16bc490413a8c88c3ca12f2d8fd438121b Merge remote branch 'origin/develop' into develop
88ebb1b34778f90f6b7860be1423a787ecc59043 临时删除
dd979e043034154cde5c7921496488a9722940d9 解决冲突
2be183df9b9460a8b21fb8bab56f6310f96d1427 Merge branch 'develop', remote branch 'origin/develop' into develop Nothing changed,but show conflict. Conflicts: 	git-rocks
7119abccd34bf2384fde00ca4388ccbe3e11f1e2 gjy branch solve confict
11d65edcb9a13da4919be791a0e90192eff11ca4 merge conflict
e1d7ca5b4235ff611b1497a823cd8981850e09b9 This is for feature branch.
67733dc8c4d710977194fd96f525da7b5dbc960e gjy branch for gjy_01
02600056c043b8cdaf132b3f0b21bfb31bf5b909 gjy branch test
a54cf41fe74d77c5c0e74539a23d7b1fa83174da lihe send something
57acad5be3e141755b26c8f1f58a8bda0c6931e8 Merge branch 'develop' of github.com:admaster/git-test into develop
c80e4eef633356670ac8ca74a56ab69ad8286a9a gong conflict solved
72ef8b7fffa6b97004b9ffd5e535117f3520beb0 gongjingying modifies name and email
19732b138ee7b16cee74736fed4fa973cf2bfa6a Merge branch 'master' of github.com:admaster/git-test into develop
f990957bccdb8411e2a6bebc6c35fb0444676e48 Merge branch 'master' of github.com:admaster/git-test
055a04f71820663ef586858ee1ad60620ce0a585 The first homework.and append something.
0463c561b22a14f040b6a18237e60f2bcd5957eb sunhaoyan git config info
38113e0555e2e474a25cb20d4f6458cdc33ccd0a 解决冲突
b7dafba5064dad2e4338b078b6962bb37cdaa98d add news
6de374273e82862c2107cfeb8f370e579f863d96 add file git-second
f97cbdf2723756a0099cea75257e4dd489ca72d9 add news
ba90c4655b06305821f68f7ae7f0f57ca2b9a33f 添加git-config配置文件
45cf9d7cc585d05183a75b6fc3bb024cbaec9bd2 发表重要讲话解决冲突后的应该位于NBA新闻后面
7fbc86810f09a617a11d4dab819646815b3da812 解决冲突
39febfc051538626ef13f2975ae947fa77763954 add new file git-rocks to git-second feature
70ed0423a4ae0ea8d3dafeed61823bd5a3df6565 解决冲突
5029915bfd54f58878c21eb4a52810bf7ab0f9c2 nba热点新闻
3ca6abd8a4cdb60ea430898aa651a2f99dfd6a3e add exercise 2
bde938f765bec02f0b34b5e65e07a6820b9a8f9e 修改姓名
e0ecbf927ce344bb8845a7afe7b7cb71393e94dc 张保良的练习
80c8f63565140c10367f656f4b575d82ff3f624c Merge branch 'master' of github.com:admaster/git-test
b2a19698c6d10fe964fe9740b3671f9e828d9e27 	modified:   foo
1993f52bc82c99efcfca044d05fea9caebdc7f07 zhaoyp modify FAQ line
33fcb3a78cdf878501e7d7e7211c0f23e5d2d1e8 in zhangjx
cc6ec0fa05fb283e8ed69dbee5d67cc514d51fd5 Merge branch 'master' of github.com:admaster/git-test
42cc3fc7d5acda3047bbae8643b3f339c1790d06 in aa
c50be714f225705068ead764e3fd30d16ead1298 Test.
3b92d70a13d6ec3863b449ff64d2dc2682f6e747 try merge
f6e78f71593a2be7c19c87d7f93145ba9d7e7e34 Merge branch 'master' of github.com:admaster/git-test
3d60a0c95eba6f3d43c8d1da29e4c75e7f40cb6e Merged
02a020a125945f2db83cb60ededfe7caccc67497 Comment from Hudie
939766ffbb5b2f305f4a81fa6e87255f18a6f101 lihe add somthing
4dd89a6e7e64baa06d1d77a7edb3ff1103da3aad Added one comment
6d389841853599f741124a7728361006a7a9dbee This is a test.
4d64599469026171762282a9b91b29e7326ba170 gjy modified
ebe65c8795269ee71b162472cac59d466ad109fa zhaoyp add faq in foo
ef9bec97b97733e56f5c7525cf52dc749e8dc5c2 hello world
65610286a79b939185528bca28c748d6114ce0f6 again add line
cc44b12767adff3097c82ab6944d9708713bfbb7 test author:redstone
7283c1e08fa1219ea9036a7d661e5e8c2fd9d41b 第一次提交。
a67cf52d4de72468fe2598cd149cf381370661df add exercise 1
75a5a89061173e892999e98400e8ef78970849fc add some tips about TODO
f449664bcbfefd939ce356dd8a3820d1df2d1833 add quick start
84cd5f7a560473853fe3536cdccdc9f1af9e9d2c initial commit