Files
git/Documentation
Remi Lespinet d96a275b91 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: Junio C Hamano <gitster@pobox.com>
2015-06-04 10:42:41 -07:00
..
2015-04-27 12:26:21 -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-03-31 14:58:38 -07:00
2014-11-04 13:14:44 -08:00
2013-10-18 13:50:12 -07:00
2015-04-28 13:00:18 -07:00
2014-11-04 13:14:44 -08:00
2013-04-12 12:00:52 -07:00
2015-04-30 11:25:06 -07:00
2014-11-04 13:14:44 -08:00
2015-01-22 13:44:14 -08:00