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

	Commit message (Expand)	Author	Age
*	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
*	Merge branch 'jc/conflict-marker-size'	Junio C Hamano	2010-01-20
\|\
\| *	rerere: honor conflict-marker-size attribute	Junio C Hamano	2010-01-17
\| *	rerere: prepare for customizable conflict marker length	Junio C Hamano	2010-01-17
\| *	rerere: use ll_merge() instead of using xdl_merge()	Junio C Hamano	2010-01-16
\| *	xdl_merge(): introduce xmparam_t for merge specific parameters	Junio C Hamano	2010-01-16
* \|	Merge branch 'jc/cache-unmerge'	Junio C Hamano	2010-01-20
\|\ \ \| \|/
\| *	rerere forget path: forget recorded resolution	Junio C Hamano	2010-01-10
\| *	rerere: refactor rerere logic to make it independent from I/O	Junio C Hamano	2010-01-10
\| *	rerere: remove silly 1024-byte line limit	Junio C Hamano	2009-12-25
* \|	Teach --[no-]rerere-autoupdate option to merge, revert and friends	Junio C Hamano	2009-12-04
\|/
*	use write_str_in_full helper to avoid literal string lengths	Jim Meyering	2009-09-13
*	replace direct calls to unlink(2) with unlink_or_warn	Alex Riesen	2009-04-29
*	rerere: remove duplicated functions	SZEDER Gábor	2009-02-14
*	Drop double-semicolon in C	Junio C Hamano	2009-02-10
*	Make some of fwrite/fclose/write/close failures visible	Alex Riesen	2008-12-04
*	Merge branch 'ar/maint-mksnpath' into ar/mksnpath	Junio C Hamano	2008-10-30
\|\
\| *	Use git_pathdup instead of xstrdup(git_path(...))	Alex Riesen	2008-10-30
* \|	Merge branch 'jc/maint-co-track'	Junio C Hamano	2008-10-21
\|\ \
\| * \|	Enhance hold_lock_file_for_{update,append}() API	Junio C Hamano	2008-10-19
\| \|/
* \|	Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer	Brandon Casey	2008-10-12
* \|	fix openssl headers conflicting with custom SHA1 implementations	Nicolas Pitre	2008-10-02
* \|	Merge branch 'jc/better-conflict-resolution'	Shawn O. Pearce	2008-09-29
\|\ \
\| * \|	rerere: understand "diff3 -m" style conflicts with the original	Junio C Hamano	2008-08-30
\| * \|	rerere.c: use symbolic constants to keep track of parsing states	Junio C Hamano	2008-08-30
\| \|/
* \|	is_directory(): a generic helper function	Junio C Hamano	2008-09-09
\|/
*	Rename path_list to string_list	Johannes Schindelin	2008-07-21
*	rerere.autoupdate: change the message when autoupdate is in effect	Junio C Hamano	2008-07-16
*	Merge branch 'js/merge-rr'	Junio C Hamano	2008-07-14
*	rerere: Separate libgit and builtin functions	Stephan Beyer	2008-07-10