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

	Commit message (Expand)	Author	Age
*	Merge branch 'tr/maint-word-diff-incomplete-line'	Junio C Hamano	2012-01-18
\|\
\| *	word-diff: ignore '\ No newline at eof' marker	Thomas Rast	2012-01-12
* \|	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
* \| \|	Merge branch 'rs/diff-cleanup-records-fix'	Junio C Hamano	2011-10-13
\|\ \ \
\| * \| \|	diff: resurrect XDF_NEED_MINIMAL with --minimal	Junio C Hamano	2011-10-03
* \| \| \|	Merge branch 'jc/maint-diffstat-numstat-context'	Junio C Hamano	2011-10-10
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|
\| * \| \|	diff: teach --stat/--numstat to honor -U$num	Junio C Hamano	2011-09-22
* \| \| \|	Merge branch 'jk/color-and-pager'	Junio C Hamano	2011-08-28
\|\ \ \ \
\| * \| \| \|	diff: don't load color config in plumbing	Jeff King	2011-08-19
\| * \| \| \|	color: delay auto-color decision until point of use	Jeff King	2011-08-19
\| * \| \| \|	git_config_colorbool: refactor stdout_is_tty handling	Jeff King	2011-08-18
\| * \| \| \|	diff: refactor COLOR_DIFF from a flag into an int	Jeff King	2011-08-18
\| \| \|_\|/ \| \|/\| \|
\| * \| \|	Merge branch 'jc/zlib-wrap' into maint	Junio C Hamano	2011-08-16
\| \|\ \ \
\| * \ \ \	Merge branch 'jk/combine-diff-binary-etc' into maint	Junio C Hamano	2011-08-16
\| \|\ \ \ \
* \| \ \ \ \	Merge branch 'rc/histogram-diff'	Junio C Hamano	2011-08-17
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \|
\| * \| \| \| \|	teach --histogram to diff	Tay Ray Chuan	2011-07-12
\| \|/ / / /
* \| \| \| \|	Merge branch 'jc/zlib-wrap'	Junio C Hamano	2011-07-19
\|\ \ \ \ \ \| \| \|_\|/ / \| \|/\| \| \|
\| * \| \| \|	zlib: zlib can only process 4GB at a time	Junio C Hamano	2011-06-10
\| * \| \| \|	zlib: wrap deflateBound() too	Junio C Hamano	2011-06-10
\| * \| \| \|	zlib: wrap deflate side of the API	Junio C Hamano	2011-06-10
\| * \| \| \|	Merge branch 'jc/rename-degrade-cc-to-c' into maint	Junio C Hamano	2011-05-31
\| \|\ \ \ \
\| * \ \ \ \	Merge branch 'jm/maint-diff-words-with-sbe' into maint	Junio C Hamano	2011-05-26
\| \|\ \ \ \ \
\| * \ \ \ \ \	Merge branch 'jc/fix-diff-files-unmerged' into maint	Junio C Hamano	2011-05-13
\| \|\ \ \ \ \ \
\| * \ \ \ \ \ \	Merge branch 'jh/dirstat' into maint	Junio C Hamano	2011-05-04
\| \|\ \ \ \ \ \ \
* \| \ \ \ \ \ \ \	Merge branch 'mg/diff-stat-count'	Junio C Hamano	2011-06-29
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	diff --stat-count: finishing touches	Junio C Hamano	2011-05-27
\| * \| \| \| \| \| \| \| \|	diff: introduce --stat-lines to limit the stat lines	Michael J Gruber	2011-05-27
\| * \| \| \| \| \| \| \| \|	diff.c: omit hidden entries from namelen calculation with --stat	Michael J Gruber	2011-05-27
* \| \| \| \| \| \| \| \| \|	Merge branch 'jk/combine-diff-binary-etc'	Junio C Hamano	2011-06-29
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| / / \| \| \|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	refactor get_textconv to not require diff_filespec	Jeff King	2011-05-23
* \| \| \| \| \| \| \| \|	Merge branch 'jk/diff-not-so-quick'	Junio C Hamano	2011-06-06
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	diff: futureproof "stop feeding the backend early" logic	Junio C Hamano	2011-05-31
* \| \| \| \| \| \| \| \| \|	Merge branch 'jm/maint-diff-words-with-sbe'	Junio C Hamano	2011-05-23
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / \|/\| \| \| \| \| \| / / / \| \| \|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	do not read beyond end of malloc'd buffer	Jim Meyering	2011-05-20
* \| \| \| \| \| \| \| \|	Merge branch 'jh/dirstat-lines'	Junio C Hamano	2011-05-13
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Mark dirstat error messages for translation	Johan Herland	2011-04-29
\| * \| \| \| \| \| \| \| \|	Improve error handling when parsing dirstat parameters	Johan Herland	2011-04-29
\| * \| \| \| \| \| \| \| \|	New --dirstat=lines mode, doing dirstat analysis based on diffstat	Johan Herland	2011-04-29
\| * \| \| \| \| \| \| \| \|	Allow specifying --dirstat cut-off percentage as a floating point number	Johan Herland	2011-04-29
\| * \| \| \| \| \| \| \| \|	Add config variable for specifying default --dirstat behavior	Johan Herland	2011-04-29
\| * \| \| \| \| \| \| \| \|	Refactor --dirstat parsing; deprecate --cumulative and --dirstat-by-file	Johan Herland	2011-04-29
\| * \| \| \| \| \| \| \| \|	Make --dirstat=0 output directories that contribute < 0.1% of changes	Johan Herland	2011-04-29
\| \| \|_\|/ / / / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'jc/fix-diff-files-unmerged'	Junio C Hamano	2011-05-06
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| / / / \| \| \|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \|	diff: remove often unused parameters from diff_unmerge()	Junio C Hamano	2011-04-23
\| * \| \| \| \| \| \|	diff.c: return filepair from diff_unmerge()	Junio C Hamano	2011-04-23
\| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'jc/diff-irreversible-delete'	Junio C Hamano	2011-04-28
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	git diff -D: omit the preimage of deletes	Junio C Hamano	2011-04-02
\| \| \|/ / / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'jc/rename-degrade-cc-to-c'	Junio C Hamano	2011-04-28
\|\ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	diffcore-rename: fall back to -C when -C -C busts the rename limit	Junio C Hamano	2011-03-22