diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-07-17 00:22:50 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-17 00:22:50 (GMT) |
| commit | 588c038ac690e012a00dcace34fb318449f5ec7c (patch) | |
| tree | d604d58fdb9d655e784d30b28b157e01eb289621 /contrib | |
| parent | e75bf76f5462af4185d8260f6feecf24dd24a516 (diff) | |
| parent | 1b1dd23f2d6a707b7077cdf6bc6d4055bd0bfb7d (diff) | |
| download | git-588c038ac690e012a00dcace34fb318449f5ec7c.zip git-588c038ac690e012a00dcace34fb318449f5ec7c.tar.gz git-588c038ac690e012a00dcace34fb318449f5ec7c.tar.bz2 | |
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 'contrib')
| -rwxr-xr-x | contrib/examples/git-merge.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/examples/git-merge.sh b/contrib/examples/git-merge.sh index 8026ccf..e9588ee 100755 --- a/contrib/examples/git-merge.sh +++ b/contrib/examples/git-merge.sh @@ -5,8 +5,8 @@ OPTIONS_KEEPDASHDASH= OPTIONS_SPEC="\ -git-merge [options] <remote>... -git-merge [options] <msg> HEAD <remote> +git merge [options] <remote>... +git merge [options] <msg> HEAD <remote> -- stat show a diffstat at the end of the merge n don't show a diffstat at the end of the merge |