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

	Commit message (Expand)	Author	Age	Files	Lines
*	t3030-merge-recursive: don't check the stderr of a subshell	SZEDER Gábor	2018-02-28	1	-16/+20
*	merge-recursive: do not look at the index during recursive mergeew/empty-merge-with-dirty-index-maint	Junio C Hamano	2018-01-09	1	-0/+50
*	submodules: allow empty working-tree dirs in merge/cherry-pickdt/empty-submodule-in-merge	David Turner	2016-11-17	1	-2/+2
*	merge-recursive: fix verbose output for multiple base trees	René Scharfe	2016-08-13	1	-0/+18
*	t/t3030-merge-recursive.sh: use the $( ... ) construct for command substitution	Elia Pinto	2015-12-27	1	-1/+1
*	t6031: move triple-rename test to t3030	Jeff King	2015-10-26	1	-0/+30
*	merge-recursive.c: tolerate missing files while refreshing indexbk/refresh-missing-ok-in-merge-recursive	Brad King	2014-02-24	1	-1/+1
*	t3030-merge-recursive: test known breakage with empty work tree	Brad King	2014-02-24	1	-0/+47
*	t3030: use test_ln_s_add to remove SYMLINKS prerequisite	Johannes Sixt	2013-06-07	1	-36/+26
*	t3030 (merge-recursive): use test_expect_code	Ramkumar Ramachandra	2011-12-09	1	-66/+6
*	t3030: fix accidental success in symlink rename	Jeff King	2011-08-14	1	-2/+5
*	i18n: use test_i18ngrep in t2020, t2204, t3030, and t3200	Junio C Hamano	2011-04-13	1	-4/+4
*	i18n: git-merge "You have not concluded your merge" messages	Ævar Arnfjörð Bjarmason	2011-03-09	1	-1/+1
*	Merge branch 'en/merge-recursive'	Junio C Hamano	2010-11-29	1	-1/+36
\|\
\| *	t3030: Add a testcase for resolvable rename/add conflict with symlinks	Schalk, Ken	2010-09-29	1	-1/+36
* \|	tests: add missing &&	Jonathan Nieder	2010-11-09	1	-1/+1
\|/
*	Merge branch 'ks/recursive-rename-add-identical'	Junio C Hamano	2010-09-15	1	-0/+35
\|\
\| *	RE: [PATCH] Avoid rename/add conflict when contents are identical	Schalk, Ken	2010-09-03	1	-0/+35
* \|	unpack_trees: group error messages by type	Matthieu Moy	2010-08-11	1	-1/+1
\|/
*	merge-recursive: demonstrate an incorrect conflict with submodule	Johannes Sixt	2010-06-11	1	-0/+29
*	Be more user-friendly when refusing to do something because of conflict.	Matthieu Moy	2010-01-12	1	-2/+4
*	refuse to merge during a merge	Clemens Buchacher	2009-06-01	1	-0/+3
*	Remove empty directories in recursive merge	Alex Riesen	2008-09-26	1	-0/+11
*	tests: use "git xyzzy" form (t0000 - t3599)	Nanako Shiraishi	2008-09-03	1	-7/+7
*	merge: fix numerus bugs around "trivial merge" area	Junio C Hamano	2008-08-23	1	-0/+11
*	tests: do not use implicit "git diff --no-index"	Junio C Hamano	2008-05-24	1	-21/+21
*	War on whitespace	Junio C Hamano	2007-06-07	1	-1/+0
*	Remove case-sensitive file in t3030-merge-recursive.	Brian Gernhardt	2007-04-19	1	-52/+52
*	t3030: merge-recursive backend test.	Junio C Hamano	2007-04-10	1	-0/+528