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

	Commit message (Expand)	Author	Age
*	Sync with 2.6.1	Junio C Hamano	2015-10-05
\|\
\| *	Sync with v2.5.4	Junio C Hamano	2015-09-28
\| \|\
\| \| *	Sync with 2.3.10	Junio C Hamano	2015-09-28
\| \| \|\
\| \| \| *	react to errors in xdi_diff	Jeff King	2015-09-28
* \| \| \|	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
\| \|/ \|/\|
* \|	standardize usage info string format	Alex Henrie	2015-01-14
\|/
*	rerere: fix for merge.conflictstyle	Felipe Contreras	2014-04-30
*	rerere: convert to use parse_pathspec	Nguyễn Thái Ngọc Duy	2013-07-15
*	i18n: rerere: mark parseopt strings for translation	Nguyễn Thái Ngọc Duy	2012-08-20
*	rerere: libify rerere_clear() and rerere_gc()	Junio C Hamano	2011-05-08
*	rerere forget: deprecate invocation without pathspec	Johannes Sixt	2011-03-02
*	rerere "remaining"	Martin von Zweigbergk	2011-02-16
*	Merge branch 'jn/merge-renormalize'	Junio C Hamano	2010-09-03
\|\
\| *	rerere: migrate to parse-options API	Jonathan Nieder	2010-08-06
* \|	Merge branch 'sg/rerere-gc-old-still-used'	Junio C Hamano	2010-08-31
\|\ \
\| * \|	rerere: fix overeager gc	SZEDER Gábor	2010-07-14
* \| \|	Merge branch 'tf/string-list-init'	Junio C Hamano	2010-08-18
\|\ \ \
\| * \| \|	string_list: Add STRING_LIST_INIT macro and make use of it.	Thiago Farina	2010-07-05
* \| \| \|	Merge branch 'js/merge-rr-fix'	Junio C Hamano	2010-07-15
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	MERGE_RR is in .git, not .git/rr-cache	Jay Soffian	2010-07-14
\| \|/ /
\| * \|	Merge branch 'rs/diff-no-minimal' into maint	Junio C Hamano	2010-06-21
* \| \|	Merge branch 'jp/string-list-api-cleanup'	Junio C Hamano	2010-06-30
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	string_list: Fix argument order for string_list_append	Julian Phillips	2010-06-27
\| \|/
* \|	Merge branch 'rs/diff-no-minimal'	Junio C Hamano	2010-06-13
\|/
*	Move 'builtin-*' into a 'builtin/' subdirectory	Linus Torvalds	2010-02-22