delta/git.git - github.com: git/git.git

	Commit message (Expand)	Author	Age	Files	Lines
*	git-apply: skip threeway in add / rename cases	Jerry Zhang	2021-12-20	1	-0/+18
*	apply: resolve trivial merge without hitting ll-merge with "--3way"	Junio C Hamano	2021-09-05	1	-0/+45
*	git-apply: allow simultaneous --cached and --3way options	Jerry Zhang	2021-04-07	1	-0/+50
*	git-apply: try threeway first when "--3way" is used	Jerry Zhang	2021-04-06	1	-0/+20
*	t4*: adjust the references to the default branch name "main"	Johannes Schindelin	2020-11-19	1	-8/+8
*	tests: mark tests relying on the current default for `init.defaultBranch`	Johannes Schindelin	2020-11-19	1	-0/+3
*	apply: respect merge.conflictStyle in --3way	Denton Liu	2019-10-24	1	-1/+1
*	t4108: demonstrate bug in apply	Denton Liu	2019-10-24	1	-2/+11
*	t4108: use `test_config` instead of `git config`	Denton Liu	2019-10-24	1	-1/+1
*	t4108: remove git command upstream of pipe	Denton Liu	2019-10-24	1	-6/+7
*	t4108: replace create_file with test_write_lines	Denton Liu	2019-10-24	1	-17/+10
*	apply: tests for the --3way option	Junio C Hamano	2012-07-09	1	-0/+54
*	apply: allow rerere() to work on --3way results	Junio C Hamano	2012-07-09	1	-0/+25
*	apply: register conflicted stages to the index	Junio C Hamano	2012-07-09	1	-0/+78