| commit | 06cbc13c6cb8867af1127ac52e005b3c36506320 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 22 Jul 2013 18:23:06 +0000 (22 11:23 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 22 Jul 2013 18:23:07 +0000 (22 11:23 -0700) | ||
| tree | 2067203fdbf3d06f08f9795458908aa4921eac00 | treesnapshot (tar.gz zip) |
| parent | 805c5a578995db7594ad0751a683bc6422655c29 | commitdiff |
| parent | 76b623584cee2421b84e12050b7ee53b0c08ee89 | commitdiff |
Merge branch 'jc/simple-add-must-be-a-no-op'
This detected a mismerge of one of "add-2.0" topics to the 'jch'
and 'pu' branches.
* jc/simple-add-must-be-a-no-op:
t2202: make sure "git add" (no args) stays a no-op
This detected a mismerge of one of "add-2.0" topics to the 'jch'
and 'pu' branches.
* jc/simple-add-must-be-a-no-op:
t2202: make sure "git add" (no args) stays a no-op