Merge branch 'pb/ref-filter-with-crlf'

[thirdparty/git.git] / builtin / am.c

diff --git a/builtin/am.c b/builtin/am.c
index 4949535a7f1f926cbe01be09b5679660126074aa..b727449aedac55a683960efb9919656226d92a77 100644 (file)
--- 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)")),