summaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorLibravatar Nicolas Vigier <boklm@mars-attacks.org>2014-02-01 02:17:59 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-02-03 12:11:10 -0800
commit51ba8ce372ad9fcab04a013252b819625c44770a (patch)
tree1f1b4a810b6a5aba1e7541ea0ec2f06cbb84344d /git-am.sh
parentcherry-pick, revert: add the --gpg-sign option (diff)
downloadtgif-51ba8ce372ad9fcab04a013252b819625c44770a.tar.xz
git-sh-setup.sh: add variable to use the stuck-long mode
If the variable $OPTIONS_STUCKLONG is not empty, then rev-parse option parsing is done in --stuck-long mode. Signed-off-by: Nicolas Vigier <boklm@mars-attacks.org> Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-am.sh')
-rwxr-xr-xgit-am.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/git-am.sh b/git-am.sh
index bbea43075b..a3b6f98822 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -4,6 +4,7 @@
SUBDIRECTORY_OK=Yes
OPTIONS_KEEPDASHDASH=
+OPTIONS_STUCKLONG=
OPTIONS_SPEC="\
git am [options] [(<mbox>|<Maildir>)...]
git am [options] (--continue | --skip | --abort)