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 /builtin/am.c | |
| parent | Merge branch 'ds/maintenance-commit-graph-auto-fix' (diff) | |
| parent | Documentation: stylistically normalize references to Signed-off-by: (diff) | |
| download | tgif-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 'builtin/am.c')
| -rw-r--r-- | builtin/am.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/am.c b/builtin/am.c index 4949535a7f..b727449aed 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -2237,7 +2237,7 @@ int cmd_am(int argc, const char **argv, const char *prefix) N_("allow fall back on 3way merging if needed")), OPT__QUIET(&state.quiet, N_("be quiet")), OPT_SET_INT('s', "signoff", &state.signoff, - N_("add a Signed-off-by line to the commit message"), + N_("add a Signed-off-by trailer to the commit message"), SIGNOFF_EXPLICIT), OPT_BOOL('u', "utf8", &state.utf8, N_("recode into utf8 (default)")), |