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

	Commit message (Expand)	Author	Age
*	rerere: record resolution even if file is not in merge base	Johannes Schindelin	2007-07-09
*	Merge branch 'jc/diff-mark'	Junio C Hamano	2007-07-07
\|\
\| *	Future-proof source for changes in xdemitconf_t	Johannes Schindelin	2007-07-06
* \|	Enable "git rerere" by the config variable rerere.enabled	Johannes Schindelin	2007-07-06
\|/
*	detect close failure on just-written file handles	Jim Meyering	2007-06-26
*	War on whitespace	Junio C Hamano	2007-06-07
*	rerere: make sorting really stable.	Junio C Hamano	2007-04-04
*	Merge 1.5.0.7 in	Junio C Hamano	2007-04-03
\|\
\| *	rerere should not repeat the earlier hunks in later ones	Junio C Hamano	2007-04-03
* \|	Merge branch 'maint'	Junio C Hamano	2007-02-25
\|\ \ \| \|/
\| *	rerere: do not deal with symlinks.	Junio C Hamano	2007-02-25
\| *	rerere: do not skip two conflicted paths next to each other.	Junio C Hamano	2007-02-25
* \|	prefixcmp(): fix-up mechanical conversion.	Junio C Hamano	2007-02-20
* \|	Mechanical conversion to use prefixcmp()	Junio C Hamano	2007-02-20
\|/
*	short i/o: fix calls to write to use xwrite or write_in_full	Andy Whitcroft	2007-01-08
*	rerere: Fix removal of already resolved path.	Junio C Hamano	2007-01-04
*	rerere gc: honor configuration and document it	Junio C Hamano	2006-12-27
*	Make git-rerere a builtin	Johannes Schindelin	2006-12-21