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

	Commit message (Expand)	Author	Age
*	add, merge, diff: do not use strcasecmp to compare config variable names	Jonathan Nieder	2011-05-14
*	Merge branch 'rs/maint-diff-fd-leak' into maint	Junio C Hamano	2010-12-26
\|\
\| *	close file on error in read_mmfile()	René Scharfe	2010-12-26
* \|	xdiff-interface.c: always trim trailing space from xfuncname matches	Brandon Casey	2010-09-09
* \|	Merge branch 'maint-1.7.0' into maint	Junio C Hamano	2010-05-04
\|\ \
\| * \|	remove ecb parameter from xdi_diff_outf()	René Scharfe	2010-05-04
\| \|/
* \|	refactor duplicated fill_mm() in checkout and merge-recursive	Michael Lukashov	2010-02-17
\|/
*	userdiff: add xdiff_clear_find_func()	René Scharfe	2009-07-01
*	Remove unused function scope local variables	Benjamin Kramer	2009-03-07
*	xdiff-interface.c: remove 10 duplicated lines	Jim Meyering	2008-11-26
*	Merge branch 'rs/blame'	Junio C Hamano	2008-11-08
\|\
\| *	add xdi_diff_hunks() for callers that only need hunk lengths	René Scharfe	2008-10-25
* \|	Merge branch 'maint'	Junio C Hamano	2008-10-17
\|\ \ \| \|/ \|/\|
\| *	xdiff-interface.c: strip newline (and cr) from line before pattern matching	Brandon Casey	2008-10-16
* \|	xdiff-interface.c: strip newline (and cr) from line before pattern matching	Brandon Casey	2008-10-02
* \|	Merge branch 'bc/master-diff-hunk-header-fix'	Shawn O. Pearce	2008-09-29
\|\ \
\| * \|	diff: fix "multiple regexp" semantics to find hunk header comment	Junio C Hamano	2008-09-20
\| * \|	Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fix	Junio C Hamano	2008-09-18
\| \|\ \ \| \| \|/
\| \| *	diff.c: associate a flag with each pattern and use it for compiling regex	Brandon Casey	2008-09-18
* \| \|	Merge branch 'jc/better-conflict-resolution'	Shawn O. Pearce	2008-09-29
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	merge.conflictstyle: choose between "merge" and "diff3 -m" styles	Junio C Hamano	2008-08-30
\| \|/
* \|	xdiff-interface: hide the whole "xdiff_emit_state" business from the caller	Junio C Hamano	2008-08-14
* \|	Use strbuf for struct xdiff_emit_state's remainder	Brian Downing	2008-08-13
* \|	Make xdi_diff_outf interface for running xdiff_outf diffs	Brian Downing	2008-08-13
\|/
*	Merge branch 'maint'	Junio C Hamano	2008-03-14
\|\
\| *	merge-file: handle empty files gracefully	Johannes Schindelin	2008-03-13
* \|	Avoid unnecessary "if-before-free" tests.	Jim Meyering	2008-02-22
\|/
*	Re(-re)*fix trim_common_tail()	Linus Torvalds	2007-12-20
*	Re-re-re-fix common tail optimization	Junio C Hamano	2007-12-16
*	trim_common_tail: brown paper bag fix.	Jeff King	2007-12-16
*	xdiff tail trimming: use correct type.	Junio C Hamano	2007-12-14
*	xdi_diff: trim common trailing lines	Junio C Hamano	2007-12-13
*	xdl_diff: identify call sites.	Junio C Hamano	2007-12-13
*	Per-path attribute based hunk header selection.	Junio C Hamano	2007-07-06
*	War on whitespace	Junio C Hamano	2007-06-07
*	Move buffer_is_binary() to xdiff-interface.h	Johannes Schindelin	2007-06-04
*	Cast 64 bit off_t to 32 bit size_t	Shawn O. Pearce	2007-03-07
*	move read_mmfile() into xdiff-interface	Johannes Schindelin	2006-12-21
*	Use xrealloc instead of realloc	Jonas Fonseca	2006-08-26
*	Match ofs/cnt types in diff interface.	Junio C Hamano	2006-04-06
*	combine-diff: move the code to parse hunk-header into common library.	Junio C Hamano	2006-04-05
*	combine-diff: refactor built-in xdiff interface.	Junio C Hamano	2006-04-05