# [PATCH] git-merge: include missing options in OPTIONS_SPEC 1 messages from 2008-05-12 to 2008-05-12. Participants: Miklos Vajna. Thread: https://gitlist.dev/t/13492 ## Miklos Vajna, 2008-05-12 14:50 Subject: [PATCH] git-merge: include missing options in OPTIONS_SPEC Message-ID: <1210603811-12613-1-git-send-email-vmiklos@frugalware.org> URL: https://gitlist.dev/e/1210603811-12613-1-git-send-email-vmiklos%40frugalware.org ``` --no-squash, --no-commit and --no-ff was missing from the output of git-merge --help. This patch fixes the issue. Signed-off-by: Miklos Vajna --- git-merge.sh | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/git-merge.sh b/git-merge.sh index 69b35d8..09c002b 100755 --- a/git-merge.sh +++ b/git-merge.sh @@ -15,8 +15,11 @@ 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 +no-squash don't create a single commit instead of merging (default) commit perform a commit if the merge sucesses (default) +no-commit don't perform a commit if the merge sucesses ff allow fast forward (default) +no-ff don't allow fast forward s,strategy= merge strategy to use m,message= message to be used for the merge commit (if any) " -- 1.5.5.1 ```