git.99rst.org Git - git.git/commit

author	Remi Lespinet <redacted>
	Tue, 4 Aug 2015 14:19:26 +0000 (22:19 +0800)
committer	Junio C Hamano <redacted>
	Wed, 5 Aug 2015 05:02:11 +0000 (22:02 -0700)
commit	e97a5e765db06995c3b027a5d7dceb6b4f2cba02
tree	d71ed7a58af0117f5e84fbf3544128a59ed18ac1	tree \| snapshot
parent	783d7e865ec8f6190f8d3abe3ab72a9410d611f1	commit \| 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 <redacted>
Signed-off-by: Paul Tan <redacted>
Signed-off-by: Junio C Hamano <redacted>

Documentation/config.txt		diff \| blob \| history
Documentation/git-am.txt		diff \| blob \| history
builtin/am.c		diff \| blob \| history
t/t4150-am.sh		diff \| blob \| history

RSS Atom

git clone https://git.99rst.org/PROJECT