| commit | d96a275b91bae1800cd43be0651e886e7e042a17 | |
| author | Remi Lespinet <remi.lespinet@ensimag.grenoble-inp.fr> | |
| Thu, 4 Jun 2015 15:04:55 +0000 (4 17:04 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 4 Jun 2015 17:42:41 +0000 (4 10:42 -0700) | ||
| tree | 8b59f9edfb9cef63cfb9288a8a3fc617aee6ecb3 | treesnapshot (tar.gz zip) |
| parent | 8c8884ce97eed5ab27a8b6f9f54a6f3795eded19 | commitdiff |
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>
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>
| Documentation/config.txt | diffblobblamehistory | |
| Documentation/git-am.txt | diffblobblamehistory | |
| git-am.sh | diffblobblamehistory | |
| t/t4150-am.sh | diffblobblamehistory |