author | Junio C Hamano <gitster@pobox.com> | |
Thu, 17 Jul 2008 00:22:50 +0000 (17:22 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Thu, 17 Jul 2008 00:22:50 +0000 (17:22 -0700) | ||
commit | 588c038ac690e012a00dcace34fb318449f5ec7c | |
tree | d604d58fdb9d655e784d30b28b157e01eb289621 | tree | snapshot |
parent | e75bf76f5462af4185d8260f6feecf24dd24a516 | commit | diff |
parent | 1b1dd23f2d6a707b7077cdf6bc6d4055bd0bfb7d | commit | diff |
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
* 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: