org/kernel/git.git - forked from git/git

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