![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 13 Dec 2010 05:49:50 +0000 (21:49 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 13 Dec 2010 05:49:50 +0000 (21:49 -0800) | ||
| commit | 6758af89e4bf3f767e189da3e09c3c939162872d | |
| tree | d0f25a4cd8c831949748fe9334aaad595e225cd1 | tree | snapshot |
| parent | 4443091d961e91041e64c1675940f0585eeba456 | commit | diff |
| parent | 9c7c27eeab73b4c90cf36c6aa06ba6b8b9777629 | commit | diff |
Merge branch 'jn/git-cmd-h-bypass-setup'
* jn/git-cmd-h-bypass-setup:
update-index -h: show usage even with corrupt index
merge -h: show usage even with corrupt index
ls-files -h: show usage even with corrupt index
gc -h: show usage even with broken configuration
commit/status -h: show usage even with broken configuration
checkout-index -h: show usage even in an invalid repository
branch -h: show usage even in an invalid repository
Conflicts:
builtin/merge.c
* jn/git-cmd-h-bypass-setup:
update-index -h: show usage even with corrupt index
merge -h: show usage even with corrupt index
ls-files -h: show usage even with corrupt index
gc -h: show usage even with broken configuration
commit/status -h: show usage even with broken configuration
checkout-index -h: show usage even in an invalid repository
branch -h: show usage even in an invalid repository
Conflicts:
builtin/merge.c
| builtin/branch.c | diff1 | | diff2 | | blob | history |
| builtin/checkout-index.c | diff1 | | diff2 | | blob | history |
| builtin/commit.c | diff1 | | diff2 | | blob | history |
| builtin/gc.c | diff1 | | diff2 | | blob | history |
| builtin/ls-files.c | diff1 | | diff2 | | blob | history |
| builtin/merge.c | diff1 | | diff2 | | blob | history |
| builtin/update-index.c | diff1 | | diff2 | | blob | history |
| t/t7508-status.sh | diff1 | | diff2 | | blob | history |