summaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-07-24 17:55:24 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-07-24 17:55:24 (GMT)
commit15dc5b5fb049bdf7abdbc610a5dec040c4d499bd (patch)
treec787e85448802c968c62cd1b99f162174cb86c17 /git-am.sh
parentf99a38c0121456822f8a9dfb7928eefceaa98201 (diff)
downloadgit-15dc5b5fb049bdf7abdbc610a5dec040c4d499bd.zip
git-15dc5b5fb049bdf7abdbc610a5dec040c4d499bd.tar.gz
git-15dc5b5fb049bdf7abdbc610a5dec040c4d499bd.tar.bz2
Revert "git-am: add am.threeWay config variable"
This reverts commit d96a275b91bae1800cd43be0651e886e7e042a17. It used to be possible to apply a patch series with "git am mbox" and then only after seeing a failure, switch to three-way mode via "git am -3" (no other options or arguments). The commit being reverted broke this workflow. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-am.sh')
-rwxr-xr-xgit-am.sh9
1 files changed, 0 insertions, 9 deletions
diff --git a/git-am.sh b/git-am.sh
index 8733071..3af351f 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -393,11 +393,6 @@ then
keepcr=t
fi
-if test "$(git config --bool --get am.threeWay)" = true
-then
- threeway=t
-fi
-
while test $# != 0
do
case "$1" in
@@ -409,8 +404,6 @@ it will be removed. Please do not use it anymore."
;;
-3|--3way)
threeway=t ;;
- --no-3way)
- threeway=f ;;
-s|--signoff)
sign=t ;;
-u|--utf8)
@@ -680,8 +673,6 @@ 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