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

	Commit message (Expand)	Author	Age
*	Merge branch 'jc/diff-algo-cleanup' into maint	Junio C Hamano	2012-05-11
\|\
\| *	xdiff: PATIENCE/HISTOGRAM are not independent option bits	Junio C Hamano	2012-02-19
* \|	Merge branch 'lp/diffstat-with-graph' into maint	Junio C Hamano	2012-05-10
\|\ \
\| * \|	Prevent graph_width of stat width from falling below min	Lucian Poston	2012-04-18
\| * \|	Adjust stat width calculations to take --graph output into account	Lucian Poston	2012-04-16
* \| \|	Merge branch 'lp/maint-diff-three-dash-with-graph' into maint	Junio C Hamano	2012-05-01
\|\ \ \
\| * \| \|	log --graph: fix break in graph lines	Lucian Poston	2012-03-20
\| * \| \|	Merge branch 'jc/maint-diffstat-numstat-context' into maint	Junio C Hamano	2011-11-01
\| \|\ \ \
\| * \ \ \	Merge branch 'rs/diff-cleanup-records-fix' into maint	Junio C Hamano	2011-10-21
\| \|\ \ \ \
* \| \ \ \ \	Merge branch 'jk/diff-no-rename-empty' into maint	Junio C Hamano	2012-04-26
\|\ \ \ \ \ \
\| * \| \| \| \| \|	teach diffcore-rename to optionally ignore empty content	Jeff King	2012-03-23
\| \| \|_\|_\|/ / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'tr/maint-word-diff-regex-sticky' into maint	Junio C Hamano	2012-04-26
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	diff: tweak a _copy_ of diff_options with word-diff	Thomas Rast	2012-03-14
\| * \| \| \| \|	diff: refactor the word-diff setup from builtin_diff_cmd	Thomas Rast	2012-03-14
\| * \| \| \| \|	Merge branch 'jc/maint-diff-patch-header' into maint	Junio C Hamano	2012-03-12
\| \|\ \ \ \ \
\| * \ \ \ \ \	Merge branch 'jc/diff-stat-scaler' into maint	Junio C Hamano	2012-02-21
\| \|\ \ \ \ \ \
* \| \ \ \ \ \ \	Merge branch 'jc/maint-diff-patch-header'	Junio C Hamano	2012-03-06
\|\ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \|	diff -p: squelch "diff --git" header for stat-dirty paths	Junio C Hamano	2012-03-01
* \| \| \| \| \| \| \|	Merge branch 'zj/diff-stat-dyncol'	Junio C Hamano	2012-03-06
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	diff --stat: add config option to limit graph width	Zbigniew Jędrzejewski-Szmek	2012-03-01
\| * \| \| \| \| \| \| \|	diff --stat: enable limiting of the graph part	Zbigniew Jędrzejewski-Szmek	2012-03-01
\| * \| \| \| \| \| \| \|	diff --stat: use a maximum of 5/8 for the filename part	Zbigniew Jędrzejewski-Szmek	2012-03-01
\| * \| \| \| \| \| \| \|	diff --stat: use the full terminal width	Zbigniew Jędrzejewski-Szmek	2012-03-01
\| \| \| \| \| \| \| \| \|
\| \| \ \ \ \ \ \ \
\| *-. \ \ \ \ \ \ \	Merge branches zj/decimal-width, zj/term-columns and jc/diff-stat-scaler	Junio C Hamano	2012-02-24
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|/ / / / / \| \| \|/\| \| \| \| \| \| / \| \| \| \| \|_\|_\|_\|_\|/ \| \| \| \|/\| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'jc/diff-stat-scaler'	Junio C Hamano	2012-02-20
\|\ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	diff --stat: show bars of same length for paths with same amount of changes	Junio C Hamano	2012-02-14
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'jk/userdiff-config-simplify'	Junio C Hamano	2012-02-14
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	drop odd return value semantics from userdiff_config	Jeff King	2012-02-07
\| \| \|/ / / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Use correct grammar in diffstat summary line	Nguyễn Thái Ngọc Duy	2012-02-03
\|/ / / / / /
* \| \| \| \| \|	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