git - git

	Commit message (Expand)	Author	Files	Lines
2010-01-11	rerere: refactor rerere logic to make it independent from I/O	Junio C Hamano	1	-35/+76
2009-12-26	rerere: remove silly 1024-byte line limit	Junio C Hamano	1	-9/+10
2009-12-26	resolve-undo: teach "update-index --unresolve" to use resolve-undo info	Junio C Hamano	3	-1/+20
2009-12-26	resolve-undo: "checkout -m path" uses resolve-undo information	Junio C Hamano	5	-0/+77
2009-12-26	resolve-undo: allow plumbing to clear the information	Junio C Hamano	2	-0/+17
2009-12-26	resolve-undo: basic tests	Junio C Hamano	2	-1/+130
2009-12-26	resolve-undo: record resolved conflicts in a new index extension section	Junio C Hamano	8	-1/+160
2009-12-26	builtin-merge.c: use standard active_cache macros	Junio C Hamano	1	-3/+2
2009-12-23	Git 1.6.6v1.6.6	Junio C Hamano	3	-4/+6