* [PATCH] Documentation/merge-options.txt: Add -S/--gpg-sign
@ 2017-10-12 9:02 W. Trevor King
2017-10-12 10:44 ` Kevin Daudt
2017-10-12 11:05 ` Junio C Hamano
0 siblings, 2 replies; 5+ messages in thread
From: W. Trevor King @ 2017-10-12 9:02 UTC (permalink / raw)
To: Git; +Cc: Junio C Hamano, W. Trevor King
Pull has supported these since ea230d8 (pull: add the --gpg-sign
option, 2014-02-10). Insert in long-option alphabetical order
following 7c85d274 (Documentation/merge-options.txt: order options in
alphabetical groups, 2009-10-22).
Signed-off-by: W. Trevor King <wking@tremily.us>
---
This patch is based on maint. It will have trivial conflicts with the
--signoff docs which landed in 14d01b4f07 (merge: add a --signoff
flag, 2017-07-04, v2.15.0-rc0~138^2).
Documentation/git-merge.txt | 6 ------
Documentation/merge-options.txt | 6 ++++++
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index f90faf7aaa..1d97a17904 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -64,12 +64,6 @@ OPTIONS
-------
include::merge-options.txt[]
--S[<keyid>]::
---gpg-sign[=<keyid>]::
- GPG-sign the resulting merge commit. The `keyid` argument is
- optional and defaults to the committer identity; if specified,
- it must be stuck to the option without a space.
-
-m <msg>::
Set the commit message to be used for the merge commit (in
case one is created).
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index 5b4a62e936..6d85a76872 100644
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -42,6 +42,12 @@ set to `no` at the beginning of them.
current `HEAD` is already up-to-date or the merge can be
resolved as a fast-forward.
+-S[<keyid>]::
+--gpg-sign[=<keyid>]::
+ GPG-sign the resulting merge commit. The `keyid` argument is
+ optional and defaults to the committer identity; if specified,
+ it must be stuck to the option without a space.
+
--log[=<n>]::
--no-log::
In addition to branch names, populate the log message with
--
2.13.6
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] Documentation/merge-options.txt: Add -S/--gpg-sign
2017-10-12 9:02 [PATCH] Documentation/merge-options.txt: Add -S/--gpg-sign W. Trevor King
@ 2017-10-12 10:44 ` Kevin Daudt
2017-10-12 10:46 ` Kevin Daudt
2017-10-12 11:05 ` Junio C Hamano
1 sibling, 1 reply; 5+ messages in thread
From: Kevin Daudt @ 2017-10-12 10:44 UTC (permalink / raw)
To: W. Trevor King; +Cc: Git, Junio C Hamano
On Thu, Oct 12, 2017 at 02:02:17AM -0700, W. Trevor King wrote:
> Pull has supported these since ea230d8 (pull: add the --gpg-sign
> option, 2014-02-10). Insert in long-option alphabetical order
> following 7c85d274 (Documentation/merge-options.txt: order options in
> alphabetical groups, 2009-10-22).
>
> Signed-off-by: W. Trevor King <wking@tremily.us>
> ---
> This patch is based on maint. It will have trivial conflicts with the
> --signoff docs which landed in 14d01b4f07 (merge: add a --signoff
> flag, 2017-07-04, v2.15.0-rc0~138^2).
>
> Documentation/git-merge.txt | 6 ------
> Documentation/merge-options.txt | 6 ++++++
> 2 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
> index f90faf7aaa..1d97a17904 100644
> --- a/Documentation/git-merge.txt
> +++ b/Documentation/git-merge.txt
> @@ -64,12 +64,6 @@ OPTIONS
> -------
> include::merge-options.txt[]
>
> --S[<keyid>]::
> ---gpg-sign[=<keyid>]::
Shouldn't the options self be removed here too, not just the
explanation?
> - GPG-sign the resulting merge commit. The `keyid` argument is
> - optional and defaults to the committer identity; if specified,
> - it must be stuck to the option without a space.
> -
> -m <msg>::
> Set the commit message to be used for the merge commit (in
> case one is created).
> diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
> index 5b4a62e936..6d85a76872 100644
> --- a/Documentation/merge-options.txt
> +++ b/Documentation/merge-options.txt
> @@ -42,6 +42,12 @@ set to `no` at the beginning of them.
> current `HEAD` is already up-to-date or the merge can be
> resolved as a fast-forward.
>
> +-S[<keyid>]::
> +--gpg-sign[=<keyid>]::
> + GPG-sign the resulting merge commit. The `keyid` argument is
> + optional and defaults to the committer identity; if specified,
> + it must be stuck to the option without a space.
> +
> --log[=<n>]::
> --no-log::
> In addition to branch names, populate the log message with
> --
> 2.13.6
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] Documentation/merge-options.txt: Add -S/--gpg-sign
2017-10-12 10:44 ` Kevin Daudt
@ 2017-10-12 10:46 ` Kevin Daudt
2017-10-12 11:10 ` Junio C Hamano
0 siblings, 1 reply; 5+ messages in thread
From: Kevin Daudt @ 2017-10-12 10:46 UTC (permalink / raw)
To: W. Trevor King; +Cc: Git, Junio C Hamano
On Thu, Oct 12, 2017 at 12:44:59PM +0200, Kevin Daudt wrote:
> On Thu, Oct 12, 2017 at 02:02:17AM -0700, W. Trevor King wrote:
> > Pull has supported these since ea230d8 (pull: add the --gpg-sign
> > option, 2014-02-10). Insert in long-option alphabetical order
> > following 7c85d274 (Documentation/merge-options.txt: order options in
> > alphabetical groups, 2009-10-22).
> >
> > Signed-off-by: W. Trevor King <wking@tremily.us>
> > ---
> > This patch is based on maint. It will have trivial conflicts with the
> > --signoff docs which landed in 14d01b4f07 (merge: add a --signoff
> > flag, 2017-07-04, v2.15.0-rc0~138^2).
> >
> > Documentation/git-merge.txt | 6 ------
> > Documentation/merge-options.txt | 6 ++++++
> > 2 files changed, 6 insertions(+), 6 deletions(-)
> >
> > diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
> > index f90faf7aaa..1d97a17904 100644
> > --- a/Documentation/git-merge.txt
> > +++ b/Documentation/git-merge.txt
> > @@ -64,12 +64,6 @@ OPTIONS
> > -------
> > include::merge-options.txt[]
> >
> > --S[<keyid>]::
> > ---gpg-sign[=<keyid>]::
>
> Shouldn't the options self be removed here too, not just the
> explanation?
>
You can ignore this, it was just my mail client that colored the diff
wrong, confusing me.
> > - GPG-sign the resulting merge commit. The `keyid` argument is
> > - optional and defaults to the committer identity; if specified,
> > - it must be stuck to the option without a space.
> > -
> > -m <msg>::
> > Set the commit message to be used for the merge commit (in
> > case one is created).
> > diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
> > index 5b4a62e936..6d85a76872 100644
> > --- a/Documentation/merge-options.txt
> > +++ b/Documentation/merge-options.txt
> > @@ -42,6 +42,12 @@ set to `no` at the beginning of them.
> > current `HEAD` is already up-to-date or the merge can be
> > resolved as a fast-forward.
> >
> > +-S[<keyid>]::
> > +--gpg-sign[=<keyid>]::
> > + GPG-sign the resulting merge commit. The `keyid` argument is
> > + optional and defaults to the committer identity; if specified,
> > + it must be stuck to the option without a space.
> > +
> > --log[=<n>]::
> > --no-log::
> > In addition to branch names, populate the log message with
> > --
> > 2.13.6
> >
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] Documentation/merge-options.txt: Add -S/--gpg-sign
2017-10-12 9:02 [PATCH] Documentation/merge-options.txt: Add -S/--gpg-sign W. Trevor King
2017-10-12 10:44 ` Kevin Daudt
@ 2017-10-12 11:05 ` Junio C Hamano
1 sibling, 0 replies; 5+ messages in thread
From: Junio C Hamano @ 2017-10-12 11:05 UTC (permalink / raw)
To: W. Trevor King; +Cc: Git
Makes sense. Will queue.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] Documentation/merge-options.txt: Add -S/--gpg-sign
2017-10-12 10:46 ` Kevin Daudt
@ 2017-10-12 11:10 ` Junio C Hamano
0 siblings, 0 replies; 5+ messages in thread
From: Junio C Hamano @ 2017-10-12 11:10 UTC (permalink / raw)
To: Kevin Daudt; +Cc: W. Trevor King, Git
Kevin Daudt <me@ikke.info> writes:
>> > --S[<keyid>]::
>> > ---gpg-sign[=<keyid>]::
>>
>> Shouldn't the options self be removed here too, not just the
>> explanation?
>
> You can ignore this, it was just my mail client that colored the diff
> wrong, confusing me.
>
>> > - GPG-sign the resulting merge commit. The `keyid` argument is
>> > - optional and defaults to the committer identity; if specified,
>> ...
;-) Very understandable confusion. Thanks for reading patches
carefully.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-10-12 11:11 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-10-12 9:02 [PATCH] Documentation/merge-options.txt: Add -S/--gpg-sign W. Trevor King
2017-10-12 10:44 ` Kevin Daudt
2017-10-12 10:46 ` Kevin Daudt
2017-10-12 11:10 ` Junio C Hamano
2017-10-12 11:05 ` Junio C Hamano
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).