Remi Lespinet e97a5e765d git-am: add am.threeWay config variable
Add the am.threeWay configuration variable to use the -3 or --3way
option of git am by default. When am.threeway is set and not desired
for a specific git am command, the --no-3way option can be used to
override it.

Signed-off-by: Remi Lespinet <remi.lespinet@ensimag.grenoble-inp.fr>
Signed-off-by: Paul Tan <pyokagan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2015-08-04 22:02:11 -07:00
..
2015-07-27 12:26:40 -07:00
2015-08-03 11:01:17 -07:00
2015-05-11 14:39:28 -07:00
2014-11-04 13:14:44 -08:00
2013-09-04 12:23:25 -07:00
2014-11-04 13:14:44 -08:00
2014-11-04 13:14:44 -08:00
2015-05-19 13:17:57 -07:00
2013-10-18 13:50:12 -07:00
2015-08-03 11:01:24 -07:00
2013-04-12 12:00:52 -07:00
2015-08-03 11:01:16 -07:00
2015-01-22 13:44:14 -08:00