diff options
| author | Brandon Casey <casey@nrlssc.navy.mil> | 2008-06-18 15:16:08 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-06-19 14:13:02 -0700 |
| commit | 037e98f20241bf013cd007b0924936a29c3cacfa (patch) | |
| tree | 520d1efc44083ad1dc71ea96ef0586d936dccf30 | |
| parent | e449f105805ffa49ccf7cf080db897ecf65a1a0f (diff) | |
| download | git-037e98f20241bf013cd007b0924936a29c3cacfa.tar.gz | |
git-merge.sh: fix typo in usage message: sucesses --> succeeds
Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -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 5fc5f5201f..8026ccff4a 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) |