git@vger.kernel.org mailing list mirror (one of many)
 help / Atom feed
From: Kevin Daudt <me@ikke.info>
To: "W. Trevor King" <wking@tremily.us>
Cc: Git <git@vger.kernel.org>, Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH] Documentation/merge-options.txt: Add -S/--gpg-sign
Date: Thu, 12 Oct 2017 12:46:22 +0200
Message-ID: <20171012104622.GB31559@alpha.vpn.ikke.info> (raw)
In-Reply-To: <20171012104459.GA31559@alpha.vpn.ikke.info>

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
> > 

  reply index

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-10-12  9:02 W. Trevor King
2017-10-12 10:44 ` Kevin Daudt
2017-10-12 10:46   ` Kevin Daudt [this message]
2017-10-12 11:10     ` Junio C Hamano
2017-10-12 11:05 ` Junio C Hamano

Reply instructions:

You may reply publically to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20171012104622.GB31559@alpha.vpn.ikke.info \
    --to=me@ikke.info \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=wking@tremily.us \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

git@vger.kernel.org mailing list mirror (one of many)

Archives are clonable:
	git clone --mirror https://public-inbox.org/git
	git clone --mirror http://ou63pmih66umazou.onion/git
	git clone --mirror http://czquwvybam4bgbro.onion/git
	git clone --mirror http://hjrcffqmbrq6wope.onion/git

Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.version-control.git
	nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git
	nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git
	nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git
	nntp://news.gmane.org/gmane.comp.version-control.git

 note: .onion URLs require Tor: https://www.torproject.org/
       or Tor2web: https://www.tor2web.org/

AGPL code for this site: git clone https://public-inbox.org/ public-inbox