Merge branch 'jn/git-cmd-h-bypass-setup'
commit6758af89e4bf3f767e189da3e09c3c939162872d
authorJunio C Hamano <gitster@pobox.com>
Mon, 13 Dec 2010 05:49:50 +0000 (12 21:49 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 13 Dec 2010 05:49:50 +0000 (12 21:49 -0800)
treed0f25a4cd8c831949748fe9334aaad595e225cd1
parent4443091d961e91041e64c1675940f0585eeba456
parent9c7c27eeab73b4c90cf36c6aa06ba6b8b9777629
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
builtin/branch.c
builtin/checkout-index.c
builtin/commit.c
builtin/gc.c
builtin/ls-files.c
builtin/merge.c
builtin/update-index.c
t/t7508-status.sh