X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-merge.sh;h=8026ccff4a459a75148740382646f7fe10b00255;hb=8bcff62baf7a17864620964c60d3a02d7c5b8d77;hp=69b35d87e62b628d45f8e934f163b7ef64e2dda6;hpb=ca1c9913f8ac0ccaf976d44822076e1bba5bcd94;p=git.git

diff --git a/git-merge.sh b/git-merge.sh
index 69b35d87e..8026ccff4 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -9,13 +9,11 @@ git-merge [options] <remote>...
 git-merge [options] <msg> HEAD <remote>
 --
 stat                 show a diffstat at the end of the merge
-n,no-stat            don't show a diffstat at the end of the merge
+n                    don't show a diffstat at the end of the merge
 summary              (synonym to --stat)
-no-summary           (synonym to --no-stat)
 log                  add list of one-line log to merge commit message
-no-log               don't 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)