From: Junio C Hamano <gitster@pobox.com>
To: "W. Trevor King" <wking@tremily.us>
Cc: Git <git@vger.kernel.org>, "Łukasz Gryglicki" <lukaszgryglicki@o2.pl>
Subject: Re: [PATCH v3] pull: pass --signoff/--no-signoff to "git merge"
Date: Fri, 13 Oct 2017 10:48:05 +0900 [thread overview]
Message-ID: <xmqqd15rx1gq.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <129274f0cc768b7a309f41315580fe1013636516.1507832722.git.wking@tremily.us> (W. Trevor King's message of "Thu, 12 Oct 2017 11:35:42 -0700")
"W. Trevor King" <wking@tremily.us> writes:
> diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
> index 4df6431c34..0ada8c856b 100644
> --- a/Documentation/git-merge.txt
> +++ b/Documentation/git-merge.txt
> @@ -64,14 +64,6 @@ OPTIONS
> -------
> include::merge-options.txt[]
>
> ---signoff::
> - Add Signed-off-by line by the committer at the end of the commit
> - log message. The meaning of a signoff depends on the project,
> - but it typically certifies that committer has
> - the rights to submit this work under the same license and
> - agrees to a Developer Certificate of Origin
> - (see http://developercertificate.org/ for more information).
> -
> -S[<keyid>]::
> --gpg-sign[=<keyid>]::
> GPG-sign the resulting merge commit. The `keyid` argument is
> diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
> index 4e32304301..f394622d65 100644
> --- a/Documentation/merge-options.txt
> +++ b/Documentation/merge-options.txt
> @@ -51,6 +51,16 @@ set to `no` at the beginning of them.
> With --no-log do not list one-line descriptions from the
> actual commits being merged.
>
> +--signoff::
> +--no-signoff::
> + Add Signed-off-by line by the committer at the end of the commit
> + log message. The meaning of a signoff depends on the project,
> + but it typically certifies that committer has
> + the rights to submit this work under the same license and
> + agrees to a Developer Certificate of Origin
> + (see http://developercertificate.org/ for more information).
> ++
> +With --no-signoff do not add a Signed-off-by line.
Makes sense. Thanks, will queue.
prev parent reply other threads:[~2017-10-13 1:48 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-11 20:10 [PATCH] pull: pass --signoff/--no-signoff to "git merge" W. Trevor King
2017-10-12 1:17 ` Junio C Hamano
2017-10-12 5:30 ` W. Trevor King
2017-10-12 5:42 ` Junio C Hamano
2017-10-12 6:23 ` W. Trevor King
2017-10-12 11:08 ` Junio C Hamano
2017-10-12 8:46 ` [PATCH v2] " W. Trevor King
2017-10-12 9:18 ` W. Trevor King
2017-10-12 10:11 ` Junio C Hamano
2017-10-12 18:35 ` [PATCH v3] " W. Trevor King
2017-10-13 1:48 ` Junio C Hamano [this message]
Reply instructions:
You may reply publicly 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=xmqqd15rx1gq.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=lukaszgryglicki@o2.pl \
--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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).