From: Brandon Casey Date: Wed, 18 Jun 2008 20:16:08 +0000 (-0500) Subject: git-merge.sh: fix typo in usage message: sucesses --> succeeds X-Git-Tag: v1.5.6.1~16 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=037e98f20241bf013cd007b0924936a29c3cacfa;p=git.git git-merge.sh: fix typo in usage message: sucesses --> succeeds Signed-off-by: Brandon Casey Signed-off-by: Junio C Hamano --- 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)