tgif.git - Terin's Improved Git Fork

Age	Commit message (Expand)	Author	Files	Lines
2011-03-26	Merge branch 'jc/maint-rerere-in-workdir'	Junio C Hamano	1	-2/+1
2011-03-23	rerere: make sure it works even in a workdir attached to a young repository	Junio C Hamano	1	-2/+1
2011-02-16	rerere "remaining"	Martin von Zweigbergk	1	-10/+68
2010-10-26	Merge branch 'jf/merge-ignore-ws'	Junio C Hamano	1	-1/+1
2010-09-03	Merge branch 'jn/merge-renormalize'	Junio C Hamano	1	-0/+4
2010-08-31	Merge branch 'sg/rerere-gc-old-still-used'	Junio C Hamano	1	-1/+7
2010-08-26	ll-merge: replace flag argument with options struct	Jonathan Nieder	1	-1/+1
2010-08-06	rerere: never renormalize	Jonathan Nieder	1	-6/+5
2010-08-06	ll-merge: let caller decide whether to renormalize	Jonathan Nieder	1	-5/+10
2010-07-14	rerere: fix overeager gc	SZEDER Gábor	1	-1/+7
2010-07-05	string_list: Add STRING_LIST_INIT macro and make use of it.	Thiago Farina	1	-5/+5
2010-06-30	Merge branch 'jp/string-list-api-cleanup'	Junio C Hamano	1	-5/+5
2010-06-27	string_list: Fix argument order for string_list_insert	Julian Phillips	1	-5/+5
2010-05-31	enums: omit trailing comma for portability	Gary V. Vaughan	1	-1/+1
2010-03-20	ll_merge(): add ancestor label parameter for diff3-style output	Jonathan Nieder	1	-2/+2
2010-02-23	rerere: fix memory leak if rerere images can't be read	Bert Wesarg	1	-3/+6
2010-01-28	rerere: fix too-short initialization	Jeff King	1	-1/+1
2010-01-20	Merge branch 'jc/conflict-marker-size'	Junio C Hamano	1	-14/+46
2010-01-20	Merge branch 'jc/cache-unmerge'	Junio C Hamano	1	-42/+217
2010-01-17	rerere: honor conflict-marker-size attribute	Junio C Hamano	1	-2/+3
2010-01-17	rerere: prepare for customizable conflict marker length	Junio C Hamano	1	-10/+44
2010-01-16	rerere: use ll_merge() instead of using xdl_merge()	Junio C Hamano	1	-4/+1
2010-01-16	xdl_merge(): introduce xmparam_t for merge specific parameters	Junio C Hamano	1	-2/+2
2010-01-10	rerere forget path: forget recorded resolution	Junio C Hamano	1	-0/+133
2010-01-10	rerere: refactor rerere logic to make it independent from I/O	Junio C Hamano	1	-35/+76
2009-12-25	rerere: remove silly 1024-byte line limit	Junio C Hamano	1	-9/+10
2009-12-04	Teach --[no-]rerere-autoupdate option to merge, revert and friends	Junio C Hamano	1	-3/+5
2009-09-13	use write_str_in_full helper to avoid literal string lengths	Jim Meyering	1	-1/+1
2009-04-29	replace direct calls to unlink(2) with unlink_or_warn	Alex Riesen	1	-1/+1
2009-02-14	rerere: remove duplicated functions	SZEDER Gábor	1	-11/+11
2009-02-10	Drop double-semicolon in C	Junio C Hamano	1	-1/+1
2008-12-04	Make some of fwrite/fclose/write/close failures visible	Alex Riesen	1	-11/+35
2008-10-30	Merge branch 'ar/maint-mksnpath' into ar/mksnpath	Junio C Hamano	1	-1/+1
2008-10-30	Use git_pathdup instead of xstrdup(git_path(...))	Alex Riesen	1	-1/+1
2008-10-21	Merge branch 'jc/maint-co-track'	Junio C Hamano	1	-1/+2
2008-10-19	Enhance hold_lock_file_for_{update,append}() API	Junio C Hamano	1	-1/+2
2008-10-12	Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer	Brandon Casey	1	-3/+1
2008-10-02	fix openssl headers conflicting with custom SHA1 implementations	Nicolas Pitre	1	-5/+5
2008-09-29	Merge branch 'jc/better-conflict-resolution'	Shawn O. Pearce	1	-10/+19
2008-09-09	is_directory(): a generic helper function	Junio C Hamano	1	-2/+1
2008-08-30	rerere: understand "diff3 -m" style conflicts with the original	Junio C Hamano	1	-2/+8
2008-08-30	rerere.c: use symbolic constants to keep track of parsing states	Junio C Hamano	1	-10/+13
2008-07-21	Rename path_list to string_list	Johannes Schindelin	1	-20/+20
2008-07-16	rerere.autoupdate: change the message when autoupdate is in effect	Junio C Hamano	1	-2/+5
2008-07-14	Merge branch 'js/merge-rr'	Junio C Hamano	1	-1/+1
2008-07-10	rerere: Separate libgit and builtin functions	Stephan Beyer	1	-0/+360