diff options
author | Junio C Hamano <gitster@pobox.com> | 2014-02-27 14:01:44 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-02-27 14:01:44 -0800 |
commit | 62bef66fe783a6a49e4418b6ce194cc94017bc7c (patch) | |
tree | c25b0184452cd4bc65ccab75ae748391c6a9f7b5 /git-sh-setup.sh | |
parent | Merge branch 'al/docs' (diff) | |
parent | pull: add the --gpg-sign option. (diff) | |
download | tgif-62bef66fe783a6a49e4418b6ce194cc94017bc7c.tar.xz |
Merge branch 'bc/gpg-sign-everywhere'
Teach "--gpg-sign" option to many commands that create commits.
* bc/gpg-sign-everywhere:
pull: add the --gpg-sign option.
rebase: add the --gpg-sign option
rebase: parse options in stuck-long mode
rebase: don't try to match -M option
rebase: remove useless arguments check
am: add the --gpg-sign option
am: parse options in stuck-long mode
git-sh-setup.sh: add variable to use the stuck-long mode
cherry-pick, revert: add the --gpg-sign option
Diffstat (limited to 'git-sh-setup.sh')
-rw-r--r-- | git-sh-setup.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/git-sh-setup.sh b/git-sh-setup.sh index fffa3c72d7..5f28b32dc7 100644 --- a/git-sh-setup.sh +++ b/git-sh-setup.sh @@ -72,6 +72,8 @@ if test -n "$OPTIONS_SPEC"; then parseopt_extra= [ -n "$OPTIONS_KEEPDASHDASH" ] && parseopt_extra="--keep-dashdash" + [ -n "$OPTIONS_STUCKLONG" ] && + parseopt_extra="$parseopt_extra --stuck-long" eval "$( echo "$OPTIONS_SPEC" | |