Junio C Hamano 6758af89e4 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		2010-12-12 21:49:50 -08:00
..
add.c	Merge branch 'nd/maint-fix-add-typo-detection' (early part)	2010-12-08 11:25:52 -08:00
annotate.c	…
apply.c	…
archive.c	…
bisect--helper.c	…
blame.c	…
branch.c	Merge branch 'jn/git-cmd-h-bypass-setup'	2010-12-12 21:49:50 -08:00
bundle.c	…
cat-file.c	…
check-attr.c	…
check-ref-format.c	…
checkout-index.c	Merge branch 'jn/git-cmd-h-bypass-setup'	2010-12-12 21:49:50 -08:00
checkout.c	…
clean.c	…
clone.c	…
commit-tree.c	…
commit.c	Merge branch 'jn/git-cmd-h-bypass-setup'	2010-12-12 21:49:50 -08:00
config.c	…
count-objects.c	…
describe.c	…
diff-files.c	…
diff-index.c	…
diff-tree.c	…
diff.c	…
fast-export.c	…
fetch-pack.c	…
fetch.c	…
fmt-merge-msg.c	…
for-each-ref.c	…
fsck.c	…
gc.c	Merge branch 'jn/git-cmd-h-bypass-setup'	2010-12-12 21:49:50 -08:00
grep.c	thread-utils.h: simplify the inclusion	2010-12-10 12:58:06 -08:00
hash-object.c	…
help.c	…
index-pack.c	…
init-db.c	…
log.c	Merge branch 'pn/commit-autosquash'	2010-12-03 16:13:06 -08:00
ls-files.c	Merge branch 'jn/git-cmd-h-bypass-setup'	2010-12-12 21:49:50 -08:00
ls-remote.c	…
ls-tree.c	…
mailinfo.c	…
mailsplit.c	…
merge-base.c	…
merge-file.c	…
merge-index.c	…
merge-ours.c	…
merge-recursive.c	…
merge-tree.c	…
merge.c	Merge branch 'jn/git-cmd-h-bypass-setup'	2010-12-12 21:49:50 -08:00
mktag.c	…
mktree.c	…
mv.c	…
name-rev.c	…
notes.c	Merge branch 'jh/notes-merge'	2010-12-08 11:24:12 -08:00
pack-objects.c	thread-utils.h: simplify the inclusion	2010-12-10 12:58:06 -08:00
pack-redundant.c	…
pack-refs.c	…
patch-id.c	…
prune-packed.c	…
prune.c	…
push.c	…
read-tree.c	…
receive-pack.c	…
reflog.c	…
remote-ext.c	…
remote-fd.c	…
remote.c	…
replace.c	…
rerere.c	…
reset.c	…
rev-list.c	…
rev-parse.c	…
revert.c	…
rm.c	…
send-pack.c	…
shortlog.c	…
show-branch.c	…
show-ref.c	…
stripspace.c	…
symbolic-ref.c	…
tag.c	Merge branch 'mg/maint-tag-rfc1991'	2010-12-08 11:24:13 -08:00
tar-tree.c	…
unpack-file.c	…
unpack-objects.c	…
update-index.c	Merge branch 'jn/git-cmd-h-bypass-setup'	2010-12-12 21:49:50 -08:00
update-ref.c	…
update-server-info.c	…
upload-archive.c	…
var.c	…
verify-pack.c	…
verify-tag.c	Merge branch 'mg/maint-tag-rfc1991'	2010-12-08 11:24:13 -08:00
write-tree.c	…