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

	Commit message (Expand)	Author	Age
*	Merge branch 'jc/rerere-multi'	Junio C Hamano	2016-04-25
\|\
\| *	rerere: allow multiple variants to exist	Junio C Hamano	2016-03-15
\| *	rerere: split conflict ID further	Junio C Hamano	2016-02-08
* \|	Merge branch 'jc/rerere'	Junio C Hamano	2015-10-05
\|\ \ \| \|/
\| *	rerere: use "struct rerere_id" instead of "char *" for conflict ID	Junio C Hamano	2015-07-24
\| *	rerere: call conflict-ids IDs	Junio C Hamano	2015-07-24
* \|	rerere: release lockfile in non-writing functions	Jeff King	2015-09-01
\|/
*	rerere.h: mark string for translation	Matthias Ruester	2014-09-15
*	rerere: convert to use parse_pathspec	Nguyễn Thái Ngọc Duy	2013-07-15
*	rerere.c: mark private file-scope symbols as static	Junio C Hamano	2012-09-15
*	rerere: libify rerere_clear() and rerere_gc()	Junio C Hamano	2011-05-08
*	rerere "remaining"	Martin von Zweigbergk	2011-02-16
*	Merge branch 'jc/cache-unmerge'	Junio C Hamano	2010-01-20
\|\
\| *	rerere forget path: forget recorded resolution	Junio C Hamano	2010-01-10
* \|	Teach --[no-]rerere-autoupdate option to merge, revert and friends	Junio C Hamano	2009-12-04
\|/
*	rerere: remove duplicated functions	SZEDER Gábor	2009-02-14
*	Rename path_list to string_list	Johannes Schindelin	2008-07-21
*	rerere: Separate libgit and builtin functions	Stephan Beyer	2008-07-10