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

View File

@ -8,13 +8,13 @@
#include "sideband.h"
static const char upload_archive_usage[] =
"git-upload-archive <repo>";
"git upload-archive <repo>";
static const char deadchild[] =
"git-upload-archive: archiver died with error";
"git upload-archive: archiver died with error";
static const char lostchild[] =
"git-upload-archive: archiver process was lost";
"git upload-archive: archiver process was lost";
static int run_upload_archive(int argc, const char **argv, const char *prefix)