[PATCH] git-merge: include missing options in OPTIONS_SPEC

From: Miklos Vajna <vmiklos@frugalware.org>
Date: May 12, 2008, 14:50 UTC
Message-ID: <1210603811-12613-1-git-send-email-vmiklos@frugalware.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 <vmiklos@frugalware.org>
---
 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