On 2020-04-02 11:07:19-0700, Junio C Hamano <gitster@xxxxxxxxx> wrote: > Đoàn Trần Công Danh <congdanhqx@xxxxxxxxx> writes: > > > Signed-off-by: Đoàn Trần Công Danh <congdanhqx@xxxxxxxxx> > > --- > > Documentation/merge-options.txt | 5 ++++- > > 1 file changed, 4 insertions(+), 1 deletion(-) > > > > diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt > > index 40dc4f5e8c..c46e4fe598 100644 > > --- a/Documentation/merge-options.txt > > +++ b/Documentation/merge-options.txt > > @@ -61,9 +61,12 @@ When not possible, refuse to merge and exit with a non-zero status. > > > > -S[<keyid>]:: > > --gpg-sign[=<keyid>]:: > > +--no-gpg-sign:: > > 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. > > + it must be stuck to the option without a space. "--no-gpg-sign" > > + is useful to countermand both `commit.gpgSign` configuration variable, > > + and earlier "--gpg-sign". > > Shouldn't [4/5] also add '--no-gpg-sign' to the header like the > above? Yes, my bad. Since it's very small change. Could you please help me do it instead. -- Danh
