tgif.git - Terin's Improved Git Fork

Age	Commit message (Expand)	Author	Files	Lines
2012-12-09	Which merge_file() function do you mean?	Junio C Hamano	1	-124/+0
2011-04-11	sparse: Fix an "symbol 'merge_file' not decared" warning	Ramsay Jones	1	-0/+1
2010-08-26	ll-merge: replace flag argument with options struct	Jonathan Nieder	1	-1/+1
2010-06-13	Merge branch 'rs/diff-no-minimal'	Junio C Hamano	1	-1/+1
2010-05-02	git diff too slow for a file	René Scharfe	1	-1/+1
2010-03-20	merge_file(): add comment explaining behavior wrt conflict style	Jonathan Nieder	1	-0/+6
2010-03-20	ll_merge(): add ancestor label parameter for diff3-style output	Jonathan Nieder	1	-1/+1
2010-01-16	merge-tree: use ll_merge() not xdl_merge()	Junio C Hamano	1	-9/+7
2010-01-16	xdl_merge(): introduce xmparam_t for merge specific parameters	Junio C Hamano	1	-3/+3
2008-10-25	Always initialize xpparam_t to 0	Brian Downing	1	-0/+1
2007-12-13	xdl_diff: identify call sites.	Junio C Hamano	1	-1/+1
2007-07-06	Future-proof source for changes in xdemitconf_t	Johannes Schindelin	1	-0/+1
2007-02-27	convert object type handling from a string to a number	Nicolas Pitre	1	-5/+5
2006-12-12	Get rid of the dependency on RCS' merge program	Johannes Schindelin	1	-62/+13
2006-09-02	Replace uses of strdup with xstrdup.	Shawn Pearce	1	-1/+1
2006-06-28	Improved three-way blob merging code	Linus Torvalds	1	-0/+166