diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-07-17 02:22:50 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-17 02:22:50 +0200 |
| commit | 588c038ac690e012a00dcace34fb318449f5ec7c (patch) | |
| tree | d604d58fdb9d655e784d30b28b157e01eb289621 /git-quiltimport.sh | |
| parent | Merge branch 'rs/archive' (diff) | |
| parent | Make usage strings dash-less (diff) | |
| download | git-588c038ac690e012a00dcace34fb318449f5ec7c.tar.xz git-588c038ac690e012a00dcace34fb318449f5ec7c.zip | |
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
Diffstat (limited to 'git-quiltimport.sh')
| -rwxr-xr-x | git-quiltimport.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-quiltimport.sh b/git-quiltimport.sh index d1efa1d741..c9aecfd913 100755 --- a/git-quiltimport.sh +++ b/git-quiltimport.sh @@ -1,7 +1,7 @@ #!/bin/sh OPTIONS_KEEPDASHDASH= OPTIONS_SPEC="\ -git-quiltimport [options] +git quiltimport [options] -- n,dry-run dry run author= author name and email address for patches without any |