tgif.git - Terin's Improved Git Fork

Age	Commit message (Expand)	Author	Files	Lines
2021-12-01	xdiff: implement a zealous diff3, or "zdiff3"	Phillip Wood	1	-0/+1
2021-05-11	xdiff-interface: replace discard_hunk_line() with a flag	Ævar Arnfjörð Bjarmason	1	-0/+1
2020-10-20	diff: add -I<regex> that ignores matching changes	Michał Kępień	1	-0/+4
2019-04-12	xdiff: use xmalloc/xrealloc	Jeff King	1	-2/+2
2018-11-02	xdiff: provide a separate emit callback for hunks	Jeff King	1	-1/+5
2018-07-17	xdiff/xdiff.h: remove unused flags	Stefan Beller	1	-8/+0
2017-11-28	diff: support anchoring line(s)	Jonathan Tan	1	-0/+4
2017-11-27	Merge branch 'jc/ignore-cr-at-eol'	Junio C Hamano	1	-10/+16
2017-11-09	Replace Free Software Foundation address in license notices	Todd Zullinger	1	-2/+2
2017-11-08	diff: --ignore-cr-at-eol	Junio C Hamano	1	-1/+3
2017-10-27	xdiff: reassign xpparm_t.flags bits	Junio C Hamano	1	-10/+14
2016-12-23	diff: retire "compaction" heuristics	Junio C Hamano	1	-2/+1
2016-09-19	diff: improve positioning of add/delete blocks in diffs	Michael Haggerty	1	-0/+1
2016-05-06	Merge branch 'jk/diff-compact-heuristic'	Junio C Hamano	1	-0/+2
2016-04-19	xdiff: implement empty line chunk heuristic	Stefan Beller	1	-0/+2
2016-02-22	xdiff: drop XDL_EMIT_COMMON	Jeff King	1	-1/+0
2013-06-19	diff: add --ignore-blank-lines option	Antoine Pelisse	1	-0/+2
2012-05-09	xdiff: remove emit_func() and xdi_diff_hunks()	René Scharfe	1	-1/+0
2012-05-09	xdiff: add hunk_func()	René Scharfe	1	-0/+5
2012-02-19	xdiff: PATIENCE/HISTOGRAM are not independent option bits	Junio C Hamano	1	-1/+4
2012-02-19	xdiff: remove XDL_PATCH_* macros	Junio C Hamano	1	-5/+0
2011-10-10	diff: add option to show whole functions as context	René Scharfe	1	-0/+1
2011-08-03	xdiff: do away with xdl_mmfile_next()	Tay Ray Chuan	1	-1/+0
2011-07-12	teach --histogram to diff	Tay Ray Chuan	1	-0/+1
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