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

	Commit message (Expand)	Author	Age
*	Merge branch 'rs/xdiff-fast-hash-fix'	Junio C Hamano	2012-05-25
\|\
\| *	xdiff: import new 32-bit version of count_masked_bytes()	René Scharfe	2012-05-23
\| *	xdiff: avoid more compiler warnings with XDL_FAST_HASH on 32-bit machines	René Scharfe	2012-05-23
\| *	xdiff: avoid compiler warnings with XDL_FAST_HASH on 32-bit machines	René Scharfe	2012-05-22
* \|	xdiff: remove unused functions	René Scharfe	2012-05-09
* \|	xdiff: remove emit_func() and xdi_diff_hunks()	René Scharfe	2012-05-09
* \|	xdiff: add hunk_func()	René Scharfe	2012-05-09
* \|	Merge branch 'tr/xdiff-fast-hash'	Junio C Hamano	2012-05-02
\|\ \ \| \|/
\| *	xdiff: choose XDL_FAST_HASH code on sizeof(long) instead of __WORDSIZE	Thomas Rast	2012-05-01
\| *	xdiff: load full words in the inner loop of xdl_hash_record	Thomas Rast	2012-04-09
* \|	Merge branch 'jc/diff-algo-cleanup'	Junio C Hamano	2012-04-15
\|\ \ \| \|/ \|/\|
\| *	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
* \|	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
* \|	Merge branch 'rs/diff-whole-function'	Junio C Hamano	2011-10-19
\|\ \
\| * \|	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
* \| \|	Merge branch 'rs/diff-cleanup-records-fix'	Junio C Hamano	2011-10-13
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Revert removal of multi-match discard heuristic in 27af01	René Scharfe	2011-09-26
* \| \|	Merge branch 'rc/histogram-diff'	Junio C Hamano	2011-09-06
\|\ \ \
\| * \| \|	xdiff/xprepare: initialise xdlclassifier_t cf in xdl_prepare_env()	Tay Ray Chuan	2011-08-31
* \| \| \|	Merge branch 'rc/histogram-diff' into HEAD	Junio C Hamano	2011-08-17
\|\ \ \ \ \| \|/ / / \| \| / / \| \|/ / \|/\| \|
\| * \|	xdiff/xhistogram: drop need for additional variable	Tay Ray Chuan	2011-08-08
\| * \|	xdiff/xhistogram: rely on xdl_trim_ends()	Tay Ray Chuan	2011-08-08
\| * \|	xdiff/xhistogram: rework handling of recursed results	Tay Ray Chuan	2011-08-08
\| * \|	xdiff: do away with xdl_mmfile_next()	Tay Ray Chuan	2011-08-03
\| * \|	xdiff/xprepare: use a smaller sample size for histogram diff	Tay Ray Chuan	2011-07-12
\| * \|	xdiff/xprepare: skip classification	Tay Ray Chuan	2011-07-12
\| * \|	teach --histogram to diff	Tay Ray Chuan	2011-07-12
\| * \|	xdiff/xpatience: factor out fall-back-diff function	Tay Ray Chuan	2011-07-07
\| * \|	xdiff/xprepare: refactor abort cleanups	Tay Ray Chuan	2011-07-07
\| * \|	xdiff/xprepare: use memset()	Tay Ray Chuan	2011-07-07
\| \|/
* \|	xdiff/xprepare: improve O(n*m) performance in xdl_cleanup_records()	Tay Ray Chuan	2011-08-17
\|/
*	Merge branch 'cb/diff-fname-optim'	Junio C Hamano	2010-11-17
\|\
\| *	diff: avoid repeated scanning while looking for funcname	René Scharfe	2010-09-30
* \|	xdiff: cast arguments for ctype functions to unsigned char	Jonathan Nieder	2010-10-06
\|/
*	xdiff: optimise for no whitespace difference when ignoring whitespace.	Dylan Reid	2010-07-05
*	xdiff/xmerge.c: use memset() instead of explicit for-loop	Alexey Mahotkin	2010-05-01
*	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 'tf/diff-whitespace-incomplete-line'	Junio C Hamano	2009-08-31
\|\
\| *	xutils: Fix xdl_recmatch() on incomplete lines	Junio C Hamano	2009-08-23
\| *	xutils: Fix hashing an incomplete line with whitespaces at the end	Junio C Hamano	2009-08-23