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
This commit is contained in:
Junio C Hamano
2008-07-16 17:22:50 -07:00
139 changed files with 350 additions and 335 deletions

2
help.c
View File

@ -40,7 +40,7 @@ static struct option builtin_help_options[] = {
};
static const char * const builtin_help_usage[] = {
"git-help [--all] [--man|--web|--info] [command]",
"git help [--all] [--man|--web|--info] [command]",
NULL
};