summaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-06-24 19:21:45 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-06-24 19:21:45 (GMT)
commit4b64c8a1eea6b44fb8505ec46cccf8255c7e6c63 (patch)
tree09b7be5b4670d10c27896b27561382c4dbe73f6f /git-am.sh
parent49ac7358da163b0f8a32ce71723b2071f962d3fd (diff)
parentd96a275b91bae1800cd43be0651e886e7e042a17 (diff)
downloadgit-4b64c8a1eea6b44fb8505ec46cccf8255c7e6c63.zip
git-4b64c8a1eea6b44fb8505ec46cccf8255c7e6c63.tar.gz
git-4b64c8a1eea6b44fb8505ec46cccf8255c7e6c63.tar.bz2
Merge branch 'rl/am-3way-config'
"git am" learned am.threeWay configuration variable. * rl/am-3way-config: git-am: add am.threeWay config variable t4150-am: refactor am -3 tests git-am.sh: fix initialization of the threeway variable
Diffstat (limited to 'git-am.sh')
-rwxr-xr-xgit-am.sh10
1 files changed, 10 insertions, 0 deletions
diff --git a/git-am.sh b/git-am.sh
index 761befb..75e701a 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -378,6 +378,7 @@ committer_date_is_author_date=
ignore_date=
allow_rerere_autoupdate=
gpg_sign_opt=
+threeway=
if test "$(git config --bool --get am.messageid)" = true
then
@@ -389,6 +390,11 @@ then
keepcr=t
fi
+if test "$(git config --bool --get am.threeWay)" = true
+then
+ threeway=t
+fi
+
while test $# != 0
do
case "$1" in
@@ -400,6 +406,8 @@ it will be removed. Please do not use it anymore."
;;
-3|--3way)
threeway=t ;;
+ --no-3way)
+ threeway=f ;;
-s|--signoff)
sign=t ;;
-u|--utf8)
@@ -657,6 +665,8 @@ fi
if test "$(cat "$dotest/threeway")" = t
then
threeway=t
+else
+ threeway=f
fi
git_apply_opt=$(cat "$dotest/apply-opt")
if test "$(cat "$dotest/sign")" = t