{"thread":{"id":"13493","subject":"[PATCH] git-merge: exclude unnecessary options from OPTIONS_SPEC","startedAt":"2008-05-12T17:22:56Z","lastAt":"2008-05-12T17:22:56Z","messageCount":1,"participants":["Miklos Vajna"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"76727","messageId":"1210612976-13534-1-git-send-email-vmiklos@frugalware.org","threadId":"13493","inReplyTo":"20080512160309.GB4821@artemis.madism.org","subject":"[PATCH] git-merge: exclude unnecessary options from OPTIONS_SPEC","fromName":"Miklos Vajna","fromEmail":"vmiklos@frugalware.org","sentAt":"2008-05-12T17:22:56Z","receivedAt":"2008-05-12T17:22:56Z","isPatch":true,"sender":{"key":"vmiklos@frugalware.org","avatar":"https://gravatar.com/avatar/401c1cbbb3a5d13e650c691a2c71d6fd0b80df1a01bc74d9f1972675dd58f2bd?d=mp&s=160"},"body":"gitcli(5) already documents them, and there are no options named\n--no-no-stat, --no-no-summary and --no-no-log.\n\nSigned-off-by: Miklos Vajna <vmiklos@frugalware.org>\n---\n\nOn Mon, May 12, 2008 at 06:03:09PM +0200, Pierre Habouzit <madcoder@debian.org> wrote:\n> > I am wondering if our move should be to remove these negatives\n> > instead\n> > of adding more like the quoted patch does.\n>\n> We should removing the no-log and no-commit indeed as there are log\n> and\n> commit. the fact that --no-foo exists when --foo exists is documented\n> in\n> gitcli manpage. We can make it even better adding a flag if needed,\n> but\n> I feel it's not.\n\nOk, here is an updated version that does this.\n\n git-merge.sh |    4 +---\n 1 files changed, 1 insertions(+), 3 deletions(-)\n\ndiff --git a/git-merge.sh b/git-merge.sh\nindex 69b35d8..5fc5f52 100755\n--- a/git-merge.sh\n+++ b/git-merge.sh\n@@ -9,11 +9,9 @@ git-merge [options] <remote>...\n git-merge [options] <msg> HEAD <remote>\n --\n stat                 show a diffstat at the end of the merge\n-n,no-stat            don't show a diffstat at the end of the merge\n+n                    don't show a diffstat at the end of the merge\n summary              (synonym to --stat)\n-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 commit               perform a commit if the merge sucesses (default)\n ff                   allow fast forward (default)\n-- \n1.5.5.1.211.g65ea3.dirty\n"}]}