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

	Commit message (Expand)	Author	Age
...
\| *	rerere: plug conflict ID leaks	Junio C Hamano	2015-07-24
\| *	rerere: handle conflicts with multiple stage #1 entries	Junio C Hamano	2015-07-24
\| *	rerere: fix an off-by-one non-bug	Junio C Hamano	2015-06-28
\| *	Merge branch 'jn/rerere-fail-on-auto-update-failure' into maint	Junio C Hamano	2015-02-24
\| \|\
* \| \|	rerere: release lockfile in non-writing functions	Jeff King	2015-09-01
* \| \|	memoize common git-path "constant" files	Jeff King	2015-08-10
* \| \|	Merge branch 'jk/rerere-forget-check-enabled'	Junio C Hamano	2015-05-26
\|\ \ \
\| * \| \|	rerere: exit silently on "forget" when rerere is disabled	Jeff King	2015-05-14
* \| \| \|	Merge branch 'jn/rerere-fail-on-auto-update-failure'	Junio C Hamano	2015-02-11
\|\ \ \ \ \| \|_\|/ / \|/\| \| / \| \| \|/ \| \|/\|
\| * \|	rerere: error out on autoupdate failure	Jonathan Nieder	2015-01-08
* \| \|	lockfile.h: extract new header file for the functions in lockfile.c	Michael Haggerty	2014-10-01
* \| \|	rerere.c: replace `git_config()` with `git_config_get_*()` family	Tanay Abhra	2014-08-07
\|/ /
* \|	Merge branch 'rs/code-cleaning'	Junio C Hamano	2014-07-16
\|\ \
\| * \|	use strbuf_addbuf for adding strbufs	René Scharfe	2014-07-10
\| \|/
* \|	read-cache: new API write_locked_index instead of write_index/write_cache	Nguyễn Thái Ngọc Duy	2014-06-13
\|/
*	pathspec: pass directory indicator to match_pathspec_item()	Nguyễn Thái Ngọc Duy	2014-02-24
*	pathspec: rename match_pathspec_depth() to match_pathspec()	Nguyễn Thái Ngọc Duy	2014-02-24
*	Merge branch 'jl/submodule-mv'	Junio C Hamano	2013-09-09
\|\
\| *	convert unmerge_cache to take struct pathspec	Nguyễn Thái Ngọc Duy	2013-07-15
\| *	rerere: convert to use parse_pathspec	Nguyễn Thái Ngọc Duy	2013-07-15
* \|	Convert "struct cache_entry *" to "const ..." wherever possible	Nguyễn Thái Ngọc Duy	2013-07-09
\|/
*	rerere forget: do not segfault if not all stages are present	Johannes Sixt	2013-04-04
*	rerere forget: grok files containing NUL	Johannes Sixt	2013-04-02
*	rerere.c: mark private file-scope symbols as static	Junio C Hamano	2012-09-15
*	Merge branch 'ar/clone-honor-umask-at-top'	Junio C Hamano	2012-07-15
\|\
\| *	rerere: make rr-cache fanout directory honor umask	Junio C Hamano	2012-07-09
* \|	rerere: remove i18n legos in result message	Nguyễn Thái Ngọc Duy	2012-06-07
\|/
*	Merge branch 'maint'	Junio C Hamano	2011-05-30
\|\
\| *	Merge branch 'jm/maint-misc-fix' into maint	Junio C Hamano	2011-05-30
\| \|\
\| \| *	rerere.c: diagnose a corrupt MERGE_RR when hitting EOF between TAB and '\0'	Jim Meyering	2011-05-26
* \| \|	plug a DIR buffer leak in rerere.c	Jim Meyering	2011-05-26
* \| \|	rerere: libify rerere_clear() and rerere_gc()	Junio C Hamano	2011-05-08
\|/ /
* \|	sparse: Fix errors and silence warnings	Stephen Boyd	2011-04-03
* \|	Merge branch 'jc/maint-rerere-in-workdir'	Junio C Hamano	2011-03-26
\|\ \
\| * \|	rerere: make sure it works even in a workdir attached to a young repository	Junio C Hamano	2011-03-23
* \| \|	rerere "remaining"	Martin von Zweigbergk	2011-02-16
\| \|/ \|/\|
* \|	Merge branch 'jf/merge-ignore-ws'	Junio C Hamano	2010-10-26
\|\ \
\| * \|	ll-merge: replace flag argument with options struct	Jonathan Nieder	2010-08-26
* \| \|	Merge branch 'jn/merge-renormalize'	Junio C Hamano	2010-09-03
\|\ \ \ \| \|/ /
\| * \|	rerere: never renormalize	Jonathan Nieder	2010-08-06
\| * \|	ll-merge: let caller decide whether to renormalize	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
* \| \| \|	string_list: Add STRING_LIST_INIT macro and make use of it.	Thiago Farina	2010-07-05
* \| \| \|	Merge branch 'jp/string-list-api-cleanup'	Junio C Hamano	2010-06-30
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|
\| * \| \|	string_list: Fix argument order for string_list_insert	Julian Phillips	2010-06-27
\| \|/ /
* \| \|	enums: omit trailing comma for portability	Gary V. Vaughan	2010-05-31
\|/ /
* \|	ll_merge(): add ancestor label parameter for diff3-style output	Jonathan Nieder	2010-03-20
\|/
*	rerere: fix memory leak if rerere images can't be read	Bert Wesarg	2010-02-23
*	rerere: fix too-short initialization	Jeff King	2010-01-28