git-am: add am.threeWay config variable
authorRemi Lespinet <remi.lespinet@ensimag.grenoble-inp.fr>
Tue, 4 Aug 2015 14:19:26 +0000 (22:19 +0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 5 Aug 2015 05:02:11 +0000 (22:02 -0700)
commite97a5e7...5db06995c3b027a5d7dceb6b4f2cba02
treed71ed7a...8af0117f5e84fbf3544128a59ed18ac1copy hash to clipboard (tree)
parent783d7e8...5ec8f6190f8d3abe3ab72a9410d611f1copy hash to clipboard (diff)
Documentation/config.txt
Documentation/git-am.txt
builtin/am.c
t/t4150-am.sh