X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-merge.sh;h=5fc5f5201f8ea8e155a25795b93bfea86fc12d12;hb=efb98b44536300f5daed25da3650033a1ce7fdef;hp=69b35d87e62b628d45f8e934f163b7ef64e2dda6;hpb=c7ea453618e41e05a06f05e3ab63d555d0ddd7d9;p=git.git

diff --git a/git-merge.sh b/git-merge.sh
index 69b35d87e..5fc5f5201 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -9,11 +9,9 @@ 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)
 ff                   allow fast forward (default)