From c3170a83d6fee30c5d10afe33d88867ba0b68218 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Mon, 12 May 2008 19:22:56 +0200 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- git-merge.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/git-merge.sh b/git-merge.sh index 69b35d87e6..5fc5f5201f 100755 --- a/git-merge.sh +++ b/git-merge.sh @@ -9,11 +9,9 @@ git-merge [options] ... git-merge [options] HEAD -- 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) -- 2.11.4.GIT