Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Tue, 15 Feb 2011 19:03:22 +0000 (11:03 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 15 Feb 2011 19:03:22 +0000 (11:03 -0800)
* 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

1  2 
builtin/merge.c
diff --cc builtin/merge.c
Simple merge