Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Revert "git-am: add am.threeWay config variable"
author
Junio C Hamano
<gitster@pobox.com>
Fri, 24 Jul 2015 17:55:24 +0000
(10:55 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Fri, 24 Jul 2015 17:55:24 +0000
(10:55 -0700)
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>
raw
|
patch
| inline |
side by side
(from:
15dc5b5
)
No differences found