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

	Commit message (Expand)	Author	Age
*	Merge branch 'master' into js/merge	Junio C Hamano	2006-12-12
\|\
\| *	diff -b: ignore whitespace at end of line	Johannes Schindelin	2006-12-04
* \|	xdl_merge(): fix and simplify conflict handling	Johannes Schindelin	2006-12-05
* \|	xdl_merge(): fix thinko	Johannes Schindelin	2006-12-02
* \|	xdl_merge(): fix an off-by-one bug	Johannes Schindelin	2006-12-02
* \|	xmerge: make return value from xdl_merge() more usable.	Junio C Hamano	2006-12-02
* \|	xdiff: add xdl_merge()	Johannes Schindelin	2006-12-02
\|/
*	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
*	Merge branch 'maint'	Junio C Hamano	2006-10-16
\|\
\| *	Fix hash function in xdiff libraryv1.4.2.4	Linus Torvalds	2006-10-16
* \|	diff: fix 2 whitespace issues	Johannes Schindelin	2006-10-12
\|/
*	Merge branch 'lt/merge-tree'	Junio C Hamano	2006-07-12
\|\
\| *	xdiff: generate "anti-diffs" aka what is common to two files	Linus Torvalds	2006-06-28
* \|	Fix more typos, primarily in the code	Pavel Roskin	2006-07-10
\|/
*	Teach diff about -b and -w flags	Johannes Schindelin	2006-06-23
*	xdiff: minor changes to match libxdiff-0.21	Junio C Hamano	2006-06-19
*	xdiff: post-process hunks to make them consistent.	Davide Libenzi	2006-04-13
*	xdiff/xdiffi.c: fix warnings about possibly uninitialized variables	Marco Roeland	2006-04-08
*	Clean-up trivially redundant diff.	Davide Libenzi	2006-04-04
*	xdiff: Show function names in hunk headers.	Mark Wooding	2006-03-27
*	built-in diff: minimum tweaks	Junio C Hamano	2006-03-25
*	builtin-diff: \No newline at end of file.	Linus Torvalds	2006-03-25
*	Use a real built-in diff generator	Linus Torvalds	2006-03-25