tgif.git - Terin's Improved Git Fork

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