summaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorJohannes Sixt <johannes.sixt@telecom.at>2007-11-06 21:33:58 +0100
committerJunio C Hamano <gitster@pobox.com>2007-11-06 13:07:48 -0800
commitdfdd7e6686833ab3c0d9af412809a5455b9573de (patch)
treefd8c99ec84d7753ccd6738b214e2780429956dbc /git-am.sh
parent5410a02ab9e6a1987147724f8ea65e6a077b3832 (diff)
downloadgit-dfdd7e6686833ab3c0d9af412809a5455b9573de.tar.gz
Give git-am back the ability to add Signed-off-by lines.
This was lost in the migration to git-rev-parse --parseopt by commit 78443d90491c1b82afdffc3d5d2ab8c1a58928b5. Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-am.sh')
-rwxr-xr-xgit-am.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-am.sh b/git-am.sh
index 876b973a4d..e5af955c6f 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -131,7 +131,7 @@ do
binary=t ;;
-3|--3way)
threeway=t ;;
- -s--signoff)
+ -s|--signoff)
sign=t ;;
-u|--utf8)
utf8=t ;; # this is now default