![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 15 Feb 2011 19:03:22 +0000 (11:03 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 15 Feb 2011 19:03:22 +0000 (11:03 -0800) | ||
| commit | 43f9f053010c119c9836b2b5f8a07c72784f79b6 | |
| tree | eb5f0ccab93ffa12afe8b0d041d1fa3a65f2c14f | tree | snapshot |
| parent | 4e363b11bdc3770efcfe55dac79f6dc18a5e562b | commit | diff |
| parent | 24231e063f0f003f8ffd7b64c7ba6a0baaaa5283 | commit | diff |
Merge branch 'maint'
* maint:
pull: do not display fetch usage on --help-all
git-tag.txt: list all modes in the description
commit,status: describe -u likewise
add: describe --patch like checkout, reset
commit,merge,tag: describe -m likewise
clone,init: describe --template using the same wording
commit,status: describe --porcelain just like push
commit,tag: use same wording for -F
configure: use AC_LANG_PROGRAM consistently
string_list_append: always set util pointer to NULL
correct type of EMPTY_TREE_SHA1_BIN
* maint:
pull: do not display fetch usage on --help-all
git-tag.txt: list all modes in the description
commit,status: describe -u likewise
add: describe --patch like checkout, reset
commit,merge,tag: describe -m likewise
clone,init: describe --template using the same wording
commit,status: describe --porcelain just like push
commit,tag: use same wording for -F
configure: use AC_LANG_PROGRAM consistently
string_list_append: always set util pointer to NULL
correct type of EMPTY_TREE_SHA1_BIN
| builtin/merge.c | diff1 | | diff2 | | blob | history |