git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v2 5/5] Documentation: document merge option --no-gpg-sign

From
Danh Doan <congdanhqx@gmail.com>
Date
Apr 3, 2020, 00:25 UTC
Message-ID
<20200403002528.GB29543@danh.dev>
In-Reply-To
<xmqqo8s93go8.fsf@gitster.c.googlers.com>
On 2020-04-02 11:07:19-0700, Junio C Hamano <gitster@pobox.com> wrote:
Show 25 quoted lines
> Đoàn Trần Công Danh  <congdanhqx@gmail.com> writes:
> 
> > Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
> > ---
> >  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
Previous: Junio C HamanoNext: Đoàn Trần Công Danh
Message 13 of 24 in “Support for `--no-gpg-sign` in git rebase, cherry-pick, etc”
  1. Dominic ChenMar 30, 2020
  2. rebase.c: teach --no-gpg-sign to git-rebaseDanh Doan, Mar 31, 2020
  3. Junio C HamanoApr 1, 2020
  4. Danh DoanApr 2, 2020
  5. 0/5 Honour and Document --no-gpg-signĐoàn Trần Công Danh, Apr 2, 2020
  6. 1/5 rebase.c: honour --no-gpg-signĐoàn Trần Công Danh, Apr 2, 2020
  7. Martin ÅgrenApr 3, 2020
  8. 3/5 Documentation: document am --no-gpg-signĐoàn Trần Công Danh, Apr 2, 2020
  9. 4/5 Documentation: reword commit --no-gpg-signĐoàn Trần Công Danh, Apr 2, 2020
  10. 2/5 cherry-pick/revert: honour --no-gpg-sign in all caseĐoàn Trần Công Danh, Apr 2, 2020
  11. 5/5 Documentation: document merge option --no-gpg-signĐoàn Trần Công Danh, Apr 2, 2020
  12. Junio C HamanoApr 2, 2020
  13. Danh DoanApr 3, 2020
  14. 0/6 Honour and Document --no-gpg-signĐoàn Trần Công Danh, Apr 3, 2020
  15. 1/6 rebase.c: honour --no-gpg-signĐoàn Trần Công Danh, Apr 3, 2020
  16. 2/6 cherry-pick/revert: honour --no-gpg-sign in all caseĐoàn Trần Công Danh, Apr 3, 2020
  17. Phillip WoodApr 3, 2020
  18. Danh DoanApr 3, 2020
  19. 3/6 Documentation: document am --no-gpg-signĐoàn Trần Công Danh, Apr 3, 2020
  20. 4/6 Documentation: reword commit --no-gpg-signĐoàn Trần Công Danh, Apr 3, 2020
  21. 5/6 Documentation: merge commit-tree --[no-]gpg-signĐoàn Trần Công Danh, Apr 3, 2020
  22. 6/6 Documentation: document merge option --no-gpg-signĐoàn Trần Công Danh, Apr 3, 2020
  23. Junio C HamanoApr 3, 2020
  24. Martin ÅgrenApr 4, 2020

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.