git-am: add am.threeWay config variable
authorRemi Lespinet <remi.lespinet@ensimag.grenoble-inp.fr>
Thu, 4 Jun 2015 15:04:55 +0000 (17:04 +0200)
committerJunio C Hamano <gitster@pobox.com>
Thu, 4 Jun 2015 17:42:41 +0000 (10:42 -0700)
commitd96a275...91bae1800cd43be0651e886e7e042a17
tree8b59f9e...fb9cef63cfb9288a8a3fc617aee6ecb3copy hash to clipboard (tree)
parent8c8884c...97eed5ab27a8b6f9f54a6f3795eded19copy hash to clipboard (diff)
Documentation/config.txt
Documentation/git-am.txt
git-am.sh
t/t4150-am.sh