tgif.git - Terin's Improved Git Fork

Age	Commit message (Expand)	Author	Files	Lines
2006-12-05	xdl_merge(): fix and simplify conflict handling	Johannes Schindelin	1	-16/+5
2006-12-04	diff -b: ignore whitespace at end of line	Johannes Schindelin	1	-1/+2
2006-12-02	xdl_merge(): fix thinko	Johannes Schindelin	1	-2/+2
2006-12-02	xdl_merge(): fix an off-by-one bug	Johannes Schindelin	1	-5/+5
2006-12-02	xmerge: make return value from xdl_merge() more usable.	Junio C Hamano	1	-10/+7
2006-12-02	xdiff: add xdl_merge()	Johannes Schindelin	4	-2/+442
2006-11-23	Increase length of function name buffer	Andy Parkins	1	-1/+1
2006-10-25	xdiff: Match GNU diff behaviour when deciding hunk comment worthiness of lines	Petr Baudis	1	-2/+1
2006-10-23	xdiff/xemit.c (xdl_find_func): Elide trailing white space in a context header.	Jim Meyering	1	-1/+1
2006-10-16	Merge branch 'maint'	Junio C Hamano	1	-2/+3
2006-10-16	Fix hash function in xdiff library	Linus Torvalds	1	-2/+3
2006-10-12	diff: fix 2 whitespace issues	Johannes Schindelin	1	-17/+12
2006-07-12	Merge branch 'lt/merge-tree'	Junio C Hamano	2	-0/+19
2006-07-10	Fix more typos, primarily in the code	Pavel Roskin	1	-3/+3
2006-06-28	xdiff: generate "anti-diffs" aka what is common to two files	Linus Torvalds	2	-0/+19
2006-06-23	Teach diff about -b and -w flags	Johannes Schindelin	7	-16/+71
2006-06-19	xdiff: minor changes to match libxdiff-0.21	Junio C Hamano	2	-7/+5
2006-04-13	xdiff: post-process hunks to make them consistent.	Davide Libenzi	2	-5/+110
2006-04-08	xdiff/xdiffi.c: fix warnings about possibly uninitialized variables	Marco Roeland	1	-2/+3
2006-04-04	Clean-up trivially redundant diff.	Davide Libenzi	4	-25/+63
2006-03-27	xdiff: Show function names in hunk headers.	Mark Wooding	5	-5/+58
2006-03-25	built-in diff: minimum tweaks	Junio C Hamano	1	-6/+10
2006-03-25	builtin-diff: \No newline at end of file.	Linus Torvalds	1	-2/+10
2006-03-25	Use a real built-in diff generator	Linus Torvalds	12	-0/+1738