{"thread":{"id":"46956","subject":"[PATCH] Documentation/merge-options.txt: Add -S/--gpg-sign","startedAt":"2017-10-12T09:00:29Z","lastAt":"2017-10-12T11:11:02Z","messageCount":5,"participants":["W. Trevor King","Kevin Daudt","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"330252","messageId":"406769a31421cb26a0e1bcf6e15bcf7ab48617c8.1507798709.git.wking@tremily.us","threadId":"46956","inReplyTo":null,"subject":"[PATCH] Documentation/merge-options.txt: Add -S/--gpg-sign","fromName":"W. Trevor King","fromEmail":"wking@tremily.us","sentAt":"2017-10-12T09:02:17Z","receivedAt":"2017-10-12T09:00:29Z","isPatch":true,"sender":{"key":"wking@tremily.us","avatar":"https://avatars.githubusercontent.com/u/209920?v=4"},"body":"Pull has supported these since ea230d8 (pull: add the --gpg-sign\noption, 2014-02-10). Insert in long-option alphabetical order\nfollowing 7c85d274 (Documentation/merge-options.txt: order options in\nalphabetical groups, 2009-10-22).\n\nSigned-off-by: W. Trevor King \n---\nThis patch is based on maint. It will have trivial conflicts with the\n--signoff docs which landed in 14d01b4f07 (merge: add a --signoff\nflag, 2017-07-04, v2.15.0-rc0~138^2).\n\n Documentation/git-merge.txt | 6 ------\n Documentation/merge-options.txt | 6 ++++++\n 2 files changed, 6 insertions(+), 6 deletions(-)\n\ndiff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt\nindex f90faf7aaa..1d97a17904 100644\n--- a/Documentation/git-merge.txt\n+++ b/Documentation/git-merge.txt\n@@ -64,12 +64,6 @@ OPTIONS\n -------\n include::merge-options.txt[]\n \n--S[]::\n---gpg-sign[=]::\n-\tGPG-sign the resulting merge commit. The `keyid` argument is\n-\toptional and defaults to the committer identity; if specified,\n-\tit must be stuck to the option without a space.\n-\n -m ::\n \tSet the commit message to be used for the merge commit (in\n \tcase one is created).\ndiff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt\nindex 5b4a62e936..6d85a76872 100644\n--- a/Documentation/merge-options.txt\n+++ b/Documentation/merge-options.txt\n@@ -42,6 +42,12 @@ set to `no` at the beginning of them.\n \tcurrent `HEAD` is already up-to-date or the merge can be\n \tresolved as a fast-forward.\n \n+-S[]::\n+--gpg-sign[=]::\n+\tGPG-sign the resulting merge commit. The `keyid` argument is\n+\toptional and defaults to the committer identity; if specified,\n+\tit must be stuck to the option without a space.\n+\n --log[=]::\n --no-log::\n \tIn addition to branch names, populate the log message with\n-- \n2.13.6\n\n"},{"id":"330262","messageId":"20171012104459.GA31559@alpha.vpn.ikke.info","threadId":"46956","inReplyTo":"406769a31421cb26a0e1bcf6e15bcf7ab48617c8.1507798709.git.wking@tremily.us","subject":"Re: [PATCH] Documentation/merge-options.txt: Add -S/--gpg-sign","fromName":"Kevin Daudt","fromEmail":"me@ikke.info","sentAt":"2017-10-12T10:44:59Z","receivedAt":"2017-10-12T10:45:07Z","isPatch":true,"sender":{"key":"me@ikke.info","avatar":"https://avatars.githubusercontent.com/u/135698?v=4"},"body":"On Thu, Oct 12, 2017 at 02:02:17AM -0700, W. Trevor King wrote:\n> Pull has supported these since ea230d8 (pull: add the --gpg-sign\n> option, 2014-02-10). Insert in long-option alphabetical order\n> following 7c85d274 (Documentation/merge-options.txt: order options in\n> alphabetical groups, 2009-10-22).\n> \n> Signed-off-by: W. Trevor King \n> ---\n> This patch is based on maint. It will have trivial conflicts with the\n> --signoff docs which landed in 14d01b4f07 (merge: add a --signoff\n> flag, 2017-07-04, v2.15.0-rc0~138^2).\n> \n> Documentation/git-merge.txt | 6 ------\n> Documentation/merge-options.txt | 6 ++++++\n> 2 files changed, 6 insertions(+), 6 deletions(-)\n> \n> diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt\n> index f90faf7aaa..1d97a17904 100644\n> --- a/Documentation/git-merge.txt\n> +++ b/Documentation/git-merge.txt\n> @@ -64,12 +64,6 @@ OPTIONS\n> -------\n> include::merge-options.txt[]\n> \n> --S[]::\n> ---gpg-sign[=]::\n\nShouldn't the options self be removed here too, not just the\nexplanation?\n\n> -\tGPG-sign the resulting merge commit. The `keyid` argument is\n> -\toptional and defaults to the committer identity; if specified,\n> -\tit must be stuck to the option without a space.\n> -\n> -m ::\n> \tSet the commit message to be used for the merge commit (in\n> \tcase one is created).\n> diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt\n> index 5b4a62e936..6d85a76872 100644\n> --- a/Documentation/merge-options.txt\n> +++ b/Documentation/merge-options.txt\n> @@ -42,6 +42,12 @@ set to `no` at the beginning of them.\n> \tcurrent `HEAD` is already up-to-date or the merge can be\n> \tresolved as a fast-forward.\n> \n> +-S[]::\n> +--gpg-sign[=]::\n> +\tGPG-sign the resulting merge commit. The `keyid` argument is\n> +\toptional and defaults to the committer identity; if specified,\n> +\tit must be stuck to the option without a space.\n> +\n> --log[=]::\n> --no-log::\n> \tIn addition to branch names, populate the log message with\n> -- \n> 2.13.6\n> \n"},{"id":"330263","messageId":"20171012104622.GB31559@alpha.vpn.ikke.info","threadId":"46956","inReplyTo":"20171012104459.GA31559@alpha.vpn.ikke.info","subject":"Re: [PATCH] Documentation/merge-options.txt: Add -S/--gpg-sign","fromName":"Kevin Daudt","fromEmail":"me@ikke.info","sentAt":"2017-10-12T10:46:22Z","receivedAt":"2017-10-12T10:46:27Z","isPatch":true,"sender":{"key":"me@ikke.info","avatar":"https://avatars.githubusercontent.com/u/135698?v=4"},"body":"On Thu, Oct 12, 2017 at 12:44:59PM +0200, Kevin Daudt wrote:\n> On Thu, Oct 12, 2017 at 02:02:17AM -0700, W. Trevor King wrote:\n> > Pull has supported these since ea230d8 (pull: add the --gpg-sign\n> > option, 2014-02-10). Insert in long-option alphabetical order\n> > following 7c85d274 (Documentation/merge-options.txt: order options in\n> > alphabetical groups, 2009-10-22).\n> > \n> > Signed-off-by: W. Trevor King \n> > ---\n> > This patch is based on maint. It will have trivial conflicts with the\n> > --signoff docs which landed in 14d01b4f07 (merge: add a --signoff\n> > flag, 2017-07-04, v2.15.0-rc0~138^2).\n> > \n> > Documentation/git-merge.txt | 6 ------\n> > Documentation/merge-options.txt | 6 ++++++\n> > 2 files changed, 6 insertions(+), 6 deletions(-)\n> > \n> > diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt\n> > index f90faf7aaa..1d97a17904 100644\n> > --- a/Documentation/git-merge.txt\n> > +++ b/Documentation/git-merge.txt\n> > @@ -64,12 +64,6 @@ OPTIONS\n> > -------\n> > include::merge-options.txt[]\n> > \n> > --S[]::\n> > ---gpg-sign[=]::\n> \n> Shouldn't the options self be removed here too, not just the\n> explanation?\n> \n\nYou can ignore this, it was just my mail client that colored the diff\nwrong, confusing me.\n\n> > -\tGPG-sign the resulting merge commit. The `keyid` argument is\n> > -\toptional and defaults to the committer identity; if specified,\n> > -\tit must be stuck to the option without a space.\n> > -\n> > -m ::\n> > \tSet the commit message to be used for the merge commit (in\n> > \tcase one is created).\n> > diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt\n> > index 5b4a62e936..6d85a76872 100644\n> > --- a/Documentation/merge-options.txt\n> > +++ b/Documentation/merge-options.txt\n> > @@ -42,6 +42,12 @@ set to `no` at the beginning of them.\n> > \tcurrent `HEAD` is already up-to-date or the merge can be\n> > \tresolved as a fast-forward.\n> > \n> > +-S[]::\n> > +--gpg-sign[=]::\n> > +\tGPG-sign the resulting merge commit. The `keyid` argument is\n> > +\toptional and defaults to the committer identity; if specified,\n> > +\tit must be stuck to the option without a space.\n> > +\n> > --log[=]::\n> > --no-log::\n> > \tIn addition to branch names, populate the log message with\n> > -- \n> > 2.13.6\n> > \n"},{"id":"330265","messageId":"xmqqbmlczkwg.fsf@gitster.mtv.corp.google.com","threadId":"46956","inReplyTo":"406769a31421cb26a0e1bcf6e15bcf7ab48617c8.1507798709.git.wking@tremily.us","subject":"Re: [PATCH] Documentation/merge-options.txt: Add -S/--gpg-sign","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2017-10-12T11:05:19Z","receivedAt":"2017-10-12T11:05:26Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Makes sense. Will queue.\n"},{"id":"330267","messageId":"xmqq376ozkn3.fsf@gitster.mtv.corp.google.com","threadId":"46956","inReplyTo":"20171012104622.GB31559@alpha.vpn.ikke.info","subject":"Re: [PATCH] Documentation/merge-options.txt: Add -S/--gpg-sign","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2017-10-12T11:10:56Z","receivedAt":"2017-10-12T11:11:02Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Kevin Daudt writes:\n\n>> > --S[]::\n>> > ---gpg-sign[=]::\n>> \n>> Shouldn't the options self be removed here too, not just the\n>> explanation?\n>\n> You can ignore this, it was just my mail client that colored the diff\n> wrong, confusing me.\n>\n>> > -\tGPG-sign the resulting merge commit. The `keyid` argument is\n>> > -\toptional and defaults to the committer identity; if specified,\n>> ...\n\n;-) Very understandable confusion. Thanks for reading patches\n carefully.\n \n"}]}