git-am: fix signoff

1 files changed, 5 insertions, 1 deletions

diff --git a/git-am.sh b/git-am.sh
index bb4fab27e4..b26eaec28b 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -5,6 +5,10 @@
 SUBDIRECTORY_OK=Yes
 OPTIONS_KEEPDASHDASH=
 OPTIONS_STUCKLONG=t
+if test "$(git config --bool --get am.signoff)" = true
+then
+    signoff="="
+fi
 OPTIONS_SPEC="\
 git am [options] [(<mbox>|<Maildir>)...]
 git am [options] (--continue | --skip | --abort)
@@ -13,7 +17,7 @@ i,interactive   run interactively
 b,binary*       (historical option -- no-op)
 3,3way          allow fall back on 3way merging if needed
 q,quiet         be quiet
-s,signoff       add a Signed-off-by line to the commit message
+s,signoff$signoff      add a Signed-off-by line to the commit message
 u,utf8          recode into utf8 (default)
 k,keep          pass -k flag to git-mailinfo
 keep-non-patch  pass -b flag to git-mailinfo