]> git.ipfire.org Git - thirdparty/git.git/commit - builtin/am.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 783d7e8) | patch
git-am: add am.threeWay config variable
authorRemi Lespinet <remi.lespinet@ensimag.grenoble-inp.fr>
Tue, 4 Aug 2015 14:19:26 +0000 (22:19 +0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 5 Aug 2015 05:02:11 +0000 (22:02 -0700)
commite97a5e765db06995c3b027a5d7dceb6b4f2cba02
treed71ed7a58af0117f5e84fbf3544128a59ed18ac1tree | snapshot
parent783d7e865ec8f6190f8d3abe3ab72a9410d611f1commit | 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>
Documentation/config.txt diff | blob | blame | history
Documentation/git-am.txt diff | blob | blame | history
builtin/am.c diff | blob | blame | history
t/t4150-am.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.