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

	Commit message (Expand)	Author	Age
*	merge overwrites unstaged changes in renamed file	Clemens Buchacher	2012-04-15
*	unpack-trees: print "Aborting" to stderr	Michael J Gruber	2011-09-21
*	i18n: use test_i18n{cmp,grep} in t7600, t7607, t7611 and t7811	Junio C Hamano	2011-04-14
*	Merge branch 'ab/i18n-st'	Junio C Hamano	2011-04-01
\|\
\| *	i18n: git-merge basic messages	Ævar Arnfjörð Bjarmason	2011-03-09
* \|	merge: merge unborn index before setting ref	Jeff King	2011-03-25
* \|	t7607: clean up stray untracked file	Jeff King	2011-03-25
* \|	t7607: mark known breakage in test 11 as fixed	Jeff King	2011-03-25
\|/
*	Merge branch 'tr/merge-unborn-clobber'	Junio C Hamano	2011-02-09
\|\
\| *	Exhibit merge bug that clobbers index&WT	Thomas Rast	2010-08-25
* \|	Merge branch 'cb/leading-path-removal'	Junio C Hamano	2010-11-29
\|\ \
\| * \|	use persistent memory for rejected paths	Clemens Buchacher	2010-11-15
\| * \|	do not overwrite files in leading path	Clemens Buchacher	2010-10-13
\| * \|	t7607: add leading-path tests	Clemens Buchacher	2010-10-13
\| * \|	t7607: use test-lib functions and check MERGE_HEAD	Clemens Buchacher	2010-10-13
* \| \|	Merge branch 'cb/maint-orphan-merge-noclobber'	Junio C Hamano	2010-11-24
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	do not overwrite untracked during merge from unborn branch	Clemens Buchacher	2010-11-15
\| \|/
* \|	Convert "! git" to "test_must_fail git"	Jared Hance	2010-07-20
\|/
*	merge-recursive: do not clobber untracked working tree garbage	Junio C Hamano	2008-12-15
*	modify/delete conflict resolution overwrites untracked file	Clemens Buchacher	2008-12-15