diff options
| author | Remi Lespinet <remi.lespinet@ensimag.grenoble-inp.fr> | 2015-08-04 22:19:26 +0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-08-04 22:02:11 -0700 |
| commit | e97a5e765db06995c3b027a5d7dceb6b4f2cba02 (patch) | |
| tree | d71ed7a58af0117f5e84fbf3544128a59ed18ac1 /git-submodule.sh | |
| parent | 783d7e865ec8f6190f8d3abe3ab72a9410d611f1 (diff) | |
| download | git-e97a5e765db06995c3b027a5d7dceb6b4f2cba02.tar.gz git-e97a5e765db06995c3b027a5d7dceb6b4f2cba02.tar.xz | |
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>
Diffstat (limited to 'git-submodule.sh')
0 files changed, 0 insertions, 0 deletions