projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 676c4f5 9c7c27e)
Merge branch 'jn/git-cmd-h-bypass-setup' into next
authorJunio C Hamano <gitster@pobox.com>
Wed, 8 Dec 2010 20:25:24 +0000 (12:25 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 8 Dec 2010 20:25:24 +0000 (12:25 -0800)
commit0fc3158a2a13f91c9b173ff0c282ef5b50da4ace
treec908c5a825f3276ce6fdaa7ee1f95d62155d06f2tree | snapshot
parent676c4f5b369e44fcdeb8187eb127848bb8042565commit | diff
parent9c7c27eeab73b4c90cf36c6aa06ba6b8b9777629commit | diff
Merge branch 'jn/git-cmd-h-bypass-setup' into next

* 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
Unnamed repository; edit this file 'description' to name the repository.