diff options
| author | Remi Lespinet <remi.lespinet@ensimag.grenoble-inp.fr> | 2015-06-04 17:04:55 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-04 10:42:41 -0700 |
| commit | d96a275b91bae1800cd43be0651e886e7e042a17 (patch) | |
| tree | 8b59f9edfb9cef63cfb9288a8a3fc617aee6ecb3 /convert.c | |
| parent | 8c8884ce97eed5ab27a8b6f9f54a6f3795eded19 (diff) | |
| download | git-d96a275b91bae1800cd43be0651e886e7e042a17.tar.gz | |
git-am: add am.threeWay config variablerl/am-3way-config
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>
Diffstat (limited to 'convert.c')
0 files changed, 0 insertions, 0 deletions