From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 12 Oct 2017 11:10:56 GMT
Subject: Re: [PATCH] Documentation/merge-options.txt: Add -S/--gpg-sign
Message-ID: <xmqq376ozkn3.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <20171012104622.GB31559@alpha.vpn.ikke.info>

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.