tgif.git - Terin's Improved Git Fork

Age	Commit message (Expand)	Author	Files	Lines
2010-03-20	xdl_merge(): move file1 and file2 labels to xmparam structure	Jonathan Nieder	1	-2/+3
2010-03-20	xdl_merge(): add optional ancestor label to diff3-style output	Jonathan Nieder	1	-0/+1
2010-03-02	refactor merge flags into xmparam_t	Bert Wesarg	1	-6/+5
2010-03-02	make union merge an xdl merge favor	Bert Wesarg	1	-0/+1
2010-01-20	Merge branch 'jc/conflict-marker-size'	Junio C Hamano	1	-1/+8
2010-01-16	xdl_merge(): allow passing down marker_size in xmparam_t	Junio C Hamano	1	-0/+3
2010-01-16	xdl_merge(): introduce xmparam_t for merge specific parameters	Junio C Hamano	1	-1/+5
2009-11-29	git-merge-file --ours, --theirs	Junio C Hamano	1	-1/+7
2009-01-23	Merge branch 'js/patience-diff'	Junio C Hamano	1	-0/+1
2009-01-07	Implement the patience diff algorithm	Johannes Schindelin	1	-0/+1
2008-12-29	diff: add option to show context between close hunks	René Scharfe	1	-0/+1
2008-10-25	Allow alternate "low-level" emit function from xdl_diff	Brian Downing	1	-0/+1
2008-08-30	xdiff-merge: optionally show conflicts in "diff3 -m" style	Junio C Hamano	1	-0/+6
2008-02-18	xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM	Johannes Schindelin	1	-0/+1
2007-07-06	Per-path attribute based hunk header selection.	Junio C Hamano	1	-0/+4
2007-06-07	War on whitespace	Junio C Hamano	1	-1/+0
2007-02-13	teach diff machinery about --ignore-space-at-eol	Johannes Schindelin	1	-1/+2
2006-12-02	xdiff: add xdl_merge()	Johannes Schindelin	1	-0/+7
2006-06-28	xdiff: generate "anti-diffs" aka what is common to two files	Linus Torvalds	1	-0/+1
2006-06-23	Teach diff about -b and -w flags	Johannes Schindelin	1	-0/+3
2006-03-27	xdiff: Show function names in hunk headers.	Mark Wooding	1	-0/+3
2006-03-25	Use a real built-in diff generator	Linus Torvalds	1	-0/+91