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

	Commit message (Expand)	Author	Age
*	Merge branch 'jk/color-diff-plain-is-context'	Junio C Hamano	2015-06-11
\|\
\| *	diff.h: rename DIFF_PLAIN color slot to DIFF_CONTEXT	Jeff King	2015-05-27
* \|	diff: convert struct combine_diff_path to object_id	brian m. carlson	2015-03-13
\|/
*	Merge branch 'jk/pretty-empty-format'	Junio C Hamano	2014-09-02
\|\
\| *	pretty: make empty userformats truly empty	Jeff King	2014-07-30
* \|	Merge branch 'jk/diff-tree-t-fix'	Junio C Hamano	2014-08-26
\|\ \ \| \|/ \|/\|
\| *	intersect_paths: respect mode in git's tree-sort	Jeff King	2014-08-20
* \|	Merge branch 'mk/show-s-no-extra-blank-line-for-merges'	Junio C Hamano	2014-06-06
\|\ \
\| * \|	git-show: fix 'git show -s' to not add extra terminator after merge commit	Max Kirillov	2014-05-15
* \| \|	combine-diff: speed it up, by using multiparent diff tree-walker directly	Kirill Smelkov	2014-04-07
* \| \|	combine-diff: move changed-paths scanning logic into its own function	Kirill Smelkov	2014-02-24
* \| \|	combine-diff: move show_log_first logic/action out of paths scanning	Kirill Smelkov	2014-02-24
\| \|/ \|/\|
* \|	combine-diff: simplify intersect_paths() further	Junio C Hamano	2014-02-24
* \|	combine-diff: combine_diff_path.len is not needed anymore	Kirill Smelkov	2014-02-24
* \|	combine-diff: optimize combine_diff_path sets intersection	Kirill Smelkov	2014-02-24
\|/
*	Merge branch 'jl/submodule-mv'	Junio C Hamano	2013-09-09
\|\
\| *	remove diff_tree_{setup,release}_paths	Nguyễn Thái Ngọc Duy	2013-07-15
* \|	Merge branch 'tr/log-full-diff-keep-true-parents'	Junio C Hamano	2013-09-09
\|\ \
\| * \|	log: use true parents for diff even when rewriting	Thomas Rast	2013-08-01
\| \|/
* \|	many small typofixes	Ondřej Bílka	2013-07-29
\|/
*	Merge branch 'cb/log-follow-with-combined'	Junio C Hamano	2013-06-11
\|\
\| *	fix segfault with git log -c --follow	Clemens Buchacher	2013-05-28
* \|	Merge branch 'mk/combine-diff-context-horizon-fix'	Junio C Hamano	2013-06-02
\|\ \
\| * \|	combine-diff.c: Fix output when changes are exactly 3 lines apart	Matthijs Kooijman	2013-05-15
* \| \|	combine-diff: coalesce lost lines optimally	Antoine Pelisse	2013-03-25
* \| \|	Allow combined diff to ignore white-spaces	Antoine Pelisse	2013-03-14
* \| \|	Merge branch 'jk/diff-graph-cleanup'	Junio C Hamano	2013-02-14
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	combine-diff.c: teach combined diffs about line prefix	John Keeping	2013-02-12
\| \|/
\| *	Merge branch 'jk/maint-null-in-trees'	Junio C Hamano	2012-08-27
\| \|\
* \| \|	combine-diff: lift 32-way limit of combined diff	Junio C Hamano	2013-02-03
* \| \|	Merge branch 'jk/maint-null-in-trees' into maint-1.7.11	Junio C Hamano	2012-09-10
\|\ \ \ \| \|/ / \|/\| / \| \|/
\| *	diff: do not use null sha1 as a sentinel value	Jeff King	2012-07-29
* \|	Merge branch 'rs/combine-diff-zero-context-at-the-beginning'	Junio C Hamano	2012-04-16
\|\ \ \| \|/ \|/\|
\| *	combine-diff: fix loop index underflow	René Scharfe	2012-03-25
* \|	pass struct commit to diff_tree_combined_merge()	René Scharfe	2011-12-17
* \|	use struct sha1_array in diff_tree_combined()	René Scharfe	2011-12-17
* \|	Merge branch 'jk/color-and-pager'	Junio C Hamano	2011-08-28
\|\ \
\| * \|	diff: refactor COLOR_DIFF from a flag into an int	Jeff King	2011-08-18
* \| \|	Merge branch 'jc/combine-diff-callback'	Junio C Hamano	2011-08-28
\|\ \ \
\| * \| \|	combine-diff: support format_callback	Junio C Hamano	2011-08-20
* \| \| \|	Merge branch 'jc/maint-combined-diff-work-tree'	Junio C Hamano	2011-08-17
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|
\| * \| \|	diff -c/--cc: do not mistake "resolved as deletion" as "use working tree"	Junio C Hamano	2011-08-04
\| * \| \|	Merge branch 'rs/diff-no-minimal' into maint	Junio C Hamano	2010-06-21
\| \|\ \ \
* \| \| \| \|	combine-diff: respect textconv attributes	Jeff King	2011-05-24
* \| \| \| \|	combine-diff: handle binary files as binary	Jeff King	2011-05-23
* \| \| \| \|	combine-diff: calculate mode_differs earlier	Jeff King	2011-05-23
* \| \| \| \|	combine-diff: split header printing into its own function	Jeff King	2011-05-23
\| \|_\|/ / \|/\| \| \|
* \| \| \|	Merge branch 'rs/diff-no-minimal'	Junio C Hamano	2010-06-13
\|\ \ \ \ \| \|/ / / \|/\| / / \| \|/ /
\| * \|	git diff too slow for a file	René Scharfe	2010-05-02
* \| \|	remove ecb parameter from xdi_diff_outf()	René Scharfe	2010-05-04
\|/ /