diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-12-13 08:49:50 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-12-13 08:49:50 +0300 |
commit | 6758af89e4bf3f767e189da3e09c3c939162872d (patch) | |
tree | d0f25a4cd8c831949748fe9334aaad595e225cd1 /preload-index.c | |
parent | 4443091d961e91041e64c1675940f0585eeba456 (diff) | |
parent | 9c7c27eeab73b4c90cf36c6aa06ba6b8b9777629 (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
Diffstat (limited to 'preload-index.c')
0 files changed, 0 insertions, 0 deletions