org/kernel/git.git - forked from git/git

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