diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-07-24 10:55:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-07-24 10:55:24 -0700 |
| commit | 15dc5b5fb049bdf7abdbc610a5dec040c4d499bd (patch) | |
| tree | c787e85448802c968c62cd1b99f162174cb86c17 /t/t3060-ls-files-with-tree.sh | |
| parent | Git 2.5.0-rc3 (diff) | |
| download | tgif-15dc5b5fb049bdf7abdbc610a5dec040c4d499bd.tar.xz | |
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 't/t3060-ls-files-with-tree.sh')
0 files changed, 0 insertions, 0 deletions