commit | e97a5e765db06995c3b027a5d7dceb6b4f2cba02 | [log] [tgz] |
---|---|---|
author | Remi Lespinet <remi.lespinet@ensimag.grenoble-inp.fr> | Tue Aug 04 22:19:26 2015 +0800 |
committer | Junio C Hamano <gitster@pobox.com> | Tue Aug 04 22:02:11 2015 -0700 |
tree | d71ed7a58af0117f5e84fbf3544128a59ed18ac1 | |
parent | 783d7e865ec8f6190f8d3abe3ab72a9410d611f1 [diff] |
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>