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

	Commit message (Expand)	Author	Age
*	Merge branch 'rs/xdiff-merge-overlapping-hunks-for-W-context'	Junio C Hamano	2016-09-21
\|\
\| *	xdiff: fix merging of hunks with -W context and -u context	René Scharfe	2016-09-14
* \|	xdiff: remove unneeded declarations	Stefan Beller	2016-09-07
\|/
*	xdiff: fix merging of appended hunk with -W	René Scharfe	2016-06-09
*	xdiff: -W: don't include common trailing empty lines in context	René Scharfe	2016-05-31
*	xdiff: ignore empty lines before added functions with -W	René Scharfe	2016-05-31
*	xdiff: handle appended chunks better with -W	René Scharfe	2016-05-31
*	xdiff: factor out match_func_rec()	René Scharfe	2016-05-31
*	xdiff: drop XDL_EMIT_COMMON	Jeff King	2016-02-22
*	C: have space around && and \|\| operators	Junio C Hamano	2013-10-16
*	diff: add --ignore-blank-lines option	Antoine Pelisse	2013-06-19
*	Merge branch 'rs/diff-postimage-in-context'	Junio C Hamano	2012-01-29
\|\
\| *	xdiff: print post-image for common records instead of pre-image	René Scharfe	2012-01-06
* \|	diff: add option to show whole functions as context	René Scharfe	2011-10-10
* \|	xdiff: factor out get_func_line()	René Scharfe	2011-10-10
\|/
*	diff: avoid repeated scanning while looking for funcname	René Scharfe	2010-09-30
*	Fix various dead stores found by the clang static analyzer	Benjamin Kramer	2009-03-15
*	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
*	Per-path attribute based hunk header selection.	Junio C Hamano	2007-07-06
*	Missing statics.	Pierre Habouzit	2007-06-08
*	War on whitespace	Junio C Hamano	2007-06-07
*	Increase length of function name buffer	Andy Parkins	2006-11-23
*	xdiff: Match GNU diff behaviour when deciding hunk comment worthiness of lines	Petr Baudis	2006-10-25
*	xdiff/xemit.c (xdl_find_func): Elide trailing white space in a context header.	Jim Meyering	2006-10-23
*	xdiff: generate "anti-diffs" aka what is common to two files	Linus Torvalds	2006-06-28
*	xdiff: Show function names in hunk headers.	Mark Wooding	2006-03-27
*	Use a real built-in diff generator	Linus Torvalds	2006-03-25