Merge branch 'sb/dashless'
authorJunio C Hamano <gitster@pobox.com>
Thu, 17 Jul 2008 00:22:50 +0000 (17:22 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 17 Jul 2008 00:22:50 +0000 (17:22 -0700)
commit588c038ac690e012a00dcace34fb318449f5ec7c
treed604d58fdb9d655e784d30b28b157e01eb289621
parente75bf76f5462af4185d8260f6feecf24dd24a516
parent1b1dd23f2d6a707b7077cdf6bc6d4055bd0bfb7d
Merge branch 'sb/dashless'

* sb/dashless:
  Make usage strings dash-less
  t/: Use "test_must_fail git" instead of "! git"
  t/test-lib.sh: exit with small negagive int is ok with test_must_fail

Conflicts:
builtin-blame.c
builtin-mailinfo.c
builtin-mailsplit.c
builtin-shortlog.c
git-am.sh
t/t4150-am.sh
t/t4200-rerere.sh
29 files changed:
builtin-archive.c
builtin-blame.c
builtin-branch.c
builtin-commit.c
builtin-describe.c
builtin-fmt-merge-msg.c
builtin-grep.c
builtin-init-db.c
builtin-log.c
builtin-ls-tree.c
builtin-mailinfo.c
builtin-mailsplit.c
builtin-rerere.c
builtin-rev-list.c
builtin-revert.c
builtin-shortlog.c
builtin-tag.c
builtin-upload-archive.c
contrib/examples/git-merge.sh
git-am.sh
git-cvsserver.perl
git-quiltimport.sh
git-svn.perl
help.c
index-pack.c
t/t4150-am.sh
t/t4200-rerere.sh
t/t7600-merge.sh
t/t9106-git-svn-commit-diff-clobber.sh