{"thread":{"id":"13492","subject":"[PATCH] git-merge: include missing options in OPTIONS_SPEC","startedAt":"2008-05-12T14:50:11Z","lastAt":"2008-05-12T14:50:11Z","messageCount":1,"participants":["Miklos Vajna"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"76710","messageId":"1210603811-12613-1-git-send-email-vmiklos@frugalware.org","threadId":"13492","inReplyTo":null,"subject":"[PATCH] git-merge: include missing options in OPTIONS_SPEC","fromName":"Miklos Vajna","fromEmail":"vmiklos@frugalware.org","sentAt":"2008-05-12T14:50:11Z","receivedAt":"2008-05-12T14:50:11Z","isPatch":true,"sender":{"key":"vmiklos@frugalware.org","avatar":"https://gravatar.com/avatar/401c1cbbb3a5d13e650c691a2c71d6fd0b80df1a01bc74d9f1972675dd58f2bd?d=mp&s=160"},"body":"--no-squash, --no-commit and --no-ff was missing from the output of\ngit-merge --help. This patch fixes the issue.\n\nSigned-off-by: Miklos Vajna <vmiklos@frugalware.org>\n---\n git-merge.sh |    3 +++\n 1 files changed, 3 insertions(+), 0 deletions(-)\n\ndiff --git a/git-merge.sh b/git-merge.sh\nindex 69b35d8..09c002b 100755\n--- a/git-merge.sh\n+++ b/git-merge.sh\n@@ -15,8 +15,11 @@ no-summary           (synonym to --no-stat)\n log                  add list of one-line log to merge commit message\n no-log               don't add list of one-line log to merge commit message\n squash               create a single commit instead of doing a merge\n+no-squash            don't create a single commit instead of merging (default)\n commit               perform a commit if the merge sucesses (default)\n+no-commit            don't perform a commit if the merge sucesses\n ff                   allow fast forward (default)\n+no-ff                don't allow fast forward\n s,strategy=          merge strategy to use\n m,message=           message to be used for the merge commit (if any)\n \"\n-- \n1.5.5.1\n"}]}