]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f99a38c) | patch
Revert "git-am: add am.threeWay config variable"
authorJunio C Hamano <gitster@pobox.com>
Fri, 24 Jul 2015 17:55:24 +0000 (10:55 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 24 Jul 2015 17:55:24 +0000 (10:55 -0700)
commit15dc5b5fb049bdf7abdbc610a5dec040c4d499bd
treec787e85448802c968c62cd1b99f162174cb86c17tree | snapshot
parentf99a38c0121456822f8a9dfb7928eefceaa98201commit | diff
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>
Documentation/config.txt diff | blob | history
Documentation/git-am.txt diff | blob | history
git-am.sh diff | blob | history
t/t4150-am.sh diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.