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>
Miklos Vajna committed
May 12, 2008 at 19:22 UTC
c3170a83d6fee30c5d10afe33d88867ba0b68218
1 file changed
+1
-3
git-merge.sh
+1
-3
@@ -9,11 +9,9 @@ git-merge [options] <remote>...
9
git-merge [options] <msg> HEAD <remote>
10
--
11
stat show a diffstat at the end of the merge
12
-n,no-stat don't show a diffstat at the end of the merge
12
+n don't show a diffstat at the end of the merge
13
summary (synonym to --stat)
14
-no-summary (synonym to --no-stat)
14
log add list of one-line log to merge commit message
16
-no-log don't add list of one-line log to merge commit message
15
squash create a single commit instead of doing a merge
16
commit perform a commit if the merge sucesses (default)
17
ff allow fast forward (default)