Re: [PATCH v6 1/2] mergetool: add automerge configuration
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Dec 27, 2020, 22:59 UTC
- Message-ID
- <xmqqzh1yn9cs.fsf@gitster.c.googlers.com>
- In-Reply-To
- <20201227222922.GA509599@ellen>
Seth House <seth@eseth.com> writes:
Show 5 quoted lines
> On Sun, Dec 27, 2020 at 02:06:58PM -0800, Junio C Hamano wrote: >> Missing Sign-off as a relayer. > > I haven't come across that in the docs on contributing to Git and my > Google searches aren't helping. Do you mind pointing me to what to add?
Documentation/SubmittingPatches#sign-off
=== Certify your work by adding your `Signed-off-by` trailer
To improve tracking of who did what, we ask you to certify that you
wrote the patch or have the right to pass it on under the same license
as ours, by "signing off" your patch. Without sign-off, we cannot
accept your patches.If you can certify the below D-C-O:
[[dco]]
.Developer's Certificate of Origin 1.1
____
By making a contribution to this project, I certify that: a. The contribution was created in whole or in part by me and I
have the right to submit it under the open source license
indicated in the file; or b. The contribution is based upon previous work that, to the best
of my knowledge, is covered under an appropriate open source
license and I have the right under that license to submit that
work with modifications, whether created in whole or in part
by me, under the same open source license (unless I am
permitted to submit under a different license), as indicated
in the file; or c. The contribution was provided directly to me by some other
person who certified (a), (b) or (c) and I have not modified
it. d. I understand and agree that this project and the contribution
are public and that a record of the contribution (including all
personal information I submit with it, including my sign-off) is
maintained indefinitely and may be redistributed consistent with
this project or the open source license(s) involved.
____ you add a "Signed-off-by" trailer to your commit, that looks like
this: ....
Signed-off-by: Random J Developer <random@developer.example.org>
....So, you'd add your own signed-off-by trailer at the end of the trailer list.
https://lore.kernel.org/git/pull.805.git.1607091741254.gitgitgadget@gmail.com/
for an example where Johannes Schindelin picked up a patch written by Dennis Ameling and relayed it to the list.
Thanks.