diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-11-02 13:17:39 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-11-02 13:17:39 -0800 |
| commit | 761a4e9ab1950fc7b868629ebe478bb41235db45 (patch) | |
| tree | 6a76720a12eabfcb037c496005f794e4a52ec0e9 /commit.c | |
| parent | 0be2d65132d6b75b2146c28eb024568afa242739 (diff) | |
| parent | 3abd4a67d912e0c0980aa34def6ea55ebde84947 (diff) | |
| download | git-761a4e9ab1950fc7b868629ebe478bb41235db45.tar.xz | |
Merge branch 'bk/sob-dco'
Document that the meaning of a Signed-off-by trailer can vary from
project to project in the end-user documentation, and clarify what
it means to this project.
* bk/sob-dco:
Documentation: stylistically normalize references to Signed-off-by:
SubmittingPatches: clarify DCO is our --signoff rule
Documentation: clarify and expand description of --signoff
doc: preparatory clean-up of description on the sign-off option
Diffstat (limited to 'commit.c')
| -rw-r--r-- | commit.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1586,7 +1586,7 @@ const char *find_commit_header(const char *msg, const char *key, size_t *out_len /* * Inspect the given string and determine the true "end" of the log message, in - * order to find where to put a new Signed-off-by: line. Ignored are + * order to find where to put a new Signed-off-by trailer. Ignored are * trailing comment lines and blank lines. To support "git commit -s * --amend" on an existing commit, we also ignore "Conflicts:". To * support "git commit -v", we truncate at cut lines. |
