diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-06-19 16:30:48 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-06-19 16:30:48 -0700 |
| commit | d3e977b943b3562021b892f1c8f966655785708a (patch) | |
| tree | 13175e8b425489c2f4bbf7196e5475fe16fd7ab3 /git-merge.sh | |
| parent | 5e2c08c6f0209e94b36d0770abae1a2b571cb0f1 (diff) | |
| parent | 3b2bbe9b8584947e33e9149f605149530faa7361 (diff) | |
| download | git-d3e977b943b3562021b892f1c8f966655785708a.tar.gz git-d3e977b943b3562021b892f1c8f966655785708a.tar.xz | |
Merge branch 'maint'
* maint:
Documentation: fix formatting in git-svn
t7502-commit.sh: test_must_fail doesn't work with inline environment variables
completion: add --graph to log command completion
git-merge.sh: fix typo in usage message: sucesses --> succeeds
Diffstat (limited to 'git-merge.sh')
| -rwxr-xr-x | git-merge.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge.sh b/git-merge.sh index 5fc5f5201..8026ccff4 100755 --- a/git-merge.sh +++ b/git-merge.sh @@ -13,7 +13,7 @@ n don't show a diffstat at the end of the merge summary (synonym to --stat) log add list of one-line log to merge commit message squash create a single commit instead of doing a merge -commit perform a commit if the merge sucesses (default) +commit perform a commit if the merge succeeds (default) ff allow fast forward (default) s,strategy= merge strategy to use m,message= message to be used for the merge commit (if any) |