git-merge: exclude unnecessary options from OPTIONS_SPEC

gitcli(5) already documents them, and there are no options named
--no-no-stat, --no-no-summary and --no-no-log.

Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/git-merge.sh b/git-merge.sh
index 69b35d87e62b628d45f8e934f163b7ef64e2dda6..5fc5f5201f8ea8e155a25795b93bfea86fc12d12 100755 (executable)
--- 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
 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)
 summary              (synonym to --stat)

-no-summary           (synonym to --no-stat)

 log                  add list of one-line log to merge commit message
 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)
 squash               create a single commit instead of doing a merge
 commit               perform a commit if the merge sucesses (default)
 ff                   allow fast forward (default)