delta/git.git - github.com: git/git.git

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'bg/xcalloc-nmemb-then-size'	Junio C Hamano	2014-06-16	1	-1/+1
\|\
\| *	diff.c: rearrange xcalloc arguments	Brian Gesiak	2014-05-27	1	-1/+1
* \|	Merge branch 'jk/diff-follow-must-take-one-pathspec'	Junio C Hamano	2014-06-16	1	-0/+3
\|\ \
\| * \|	move "--follow needs one pathspec" rule to diff_setup_donejk/diff-follow-must-take-one-pathspec	Jeff King	2014-05-20	1	-0/+3
* \| \|	Merge branch 'jk/external-diff-use-argv-array'	Junio C Hamano	2014-06-03	1	-31/+25
\|\ \ \
\| * \| \|	run_external_diff: refactor cmdline setup logicjk/external-diff-use-argv-array	Jeff King	2014-04-21	1	-11/+15
\| * \| \|	run_external_diff: hoist common bits out of conditional	Jeff King	2014-04-21	1	-5/+3
\| * \| \|	run_external_diff: drop fflush(NULL)	Jeff King	2014-04-21	1	-1/+0
\| * \| \|	run_external_diff: clean up error handling	Jeff King	2014-04-21	1	-6/+3
\| * \| \|	run_external_diff: use an argv_array for the environment	Jeff King	2014-04-21	1	-9/+5
* \| \| \|	Merge branch 'ks/tree-diff-nway'	Junio C Hamano	2014-06-03	1	-0/+2
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|
\| * \| \|	combine-diff: speed it up, by using multiparent diff tree-walker directly	Kirill Smelkov	2014-04-07	1	-0/+1
\| * \| \|	tree-diff: rework diff_tree() to generate diffs for multiparent cases as well	Kirill Smelkov	2014-04-07	1	-0/+1
* \| \| \|	Merge branch 'jk/external-diff-use-argv-array' (early part)	Junio C Hamano	2014-04-28	1	-16/+16
\|\ \ \ \ \| \| \|/ / \| \|/\| \|
\| * \| \|	run_external_diff: use an argv_array for the command line	Jeff King	2014-04-21	1	-16/+16
* \| \| \|	i18n: remove obsolete comments for translators in diffstat generation	Jiang Xin	2014-04-17	1	-8/+0
* \| \| \|	Merge branch 'jl/nor-or-nand-and'	Junio C Hamano	2014-04-08	1	-1/+1
\|\ \ \ \ \| \|/ / /
\| * \| \|	comments: fix misuses of "nor"	Justin Lebar	2014-03-31	1	-1/+1
\| * \| \|	Merge branch 'tr/diff-submodule-no-reuse-worktree' into maint	Junio C Hamano	2014-03-18	1	-2/+3
\| \|\ \ \
\| * \ \ \	Merge branch 'nd/diff-quiet-stat-dirty' into maint	Junio C Hamano	2014-03-18	1	-24/+43
\| \|\ \ \ \ \| \| \|_\|/ / \| \|/\| \| \|
* \| \| \| \|	Merge branch 'rm/strchrnul-not-strlen'	Junio C Hamano	2014-03-18	1	-6/+3
\|\ \ \ \ \
\| * \| \| \| \|	use strchrnul() in place of strchr() and strlen()rm/strchrnul-not-strlen	Rohit Mani	2014-03-10	1	-6/+3
\| \|/ / / /
* \| \| \| \|	Merge branch 'dd/use-alloc-grow'	Junio C Hamano	2014-03-18	1	-10/+2
\|\ \ \ \ \
\| * \| \| \| \|	diff.c: use ALLOC_GROW()	Dmitry S. Dolzhenko	2014-03-03	1	-10/+2
\| \|/ / / /
* \| \| \| \|	Merge branch 'tr/diff-submodule-no-reuse-worktree'	Junio C Hamano	2014-03-14	1	-2/+3
\|\ \ \ \ \ \| \| \|_\|/ / \| \|/\| \| \|
\| * \| \| \|	diff: do not reuse_worktree_file for submodulestr/diff-submodule-no-reuse-worktree	Thomas Rast	2014-02-18	1	-2/+3
* \| \| \| \|	Merge branch 'jc/hold-diff-remove-q-synonym-for-no-deletion'	Junio C Hamano	2014-03-07	1	-8/+0
\|\ \ \ \ \
\| * \| \| \| \|	diff: remove "diff-files -q" in a version of Git in a distant futurejc/hold-diff-remove-q-synonym-for-no-deletion	Junio C Hamano	2013-07-19	1	-8/+0
* \| \| \| \| \|	Merge branch 'nd/diff-quiet-stat-dirty'	Junio C Hamano	2014-02-27	1	-24/+43
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| / / \| \| \|_\|/ / \| \|/\| \| \|
\| * \| \| \|	diff: do not quit early on stat-dirty filesnd/diff-quiet-stat-dirty	Nguyễn Thái Ngọc Duy	2014-02-24	1	-5/+17
\| * \| \| \|	diff.c: move diffcore_skip_stat_unmatch core logic out for reuse later	Nguyễn Thái Ngọc Duy	2014-02-24	1	-21/+28
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge branch 'jk/diff-filespec-cleanup'	Junio C Hamano	2014-01-27	1	-2/+2
\|\ \ \ \
\| * \| \| \|	diff_filespec: drop xfrm_flags field	Jeff King	2014-01-17	1	-2/+2
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge branch 'sb/diff-orderfile-config'	Junio C Hamano	2014-01-10	1	-0/+5
\|\ \ \ \
\| * \| \| \|	diff: add diff.orderfile configuration variable	Samuel Bronson	2013-12-18	1	-0/+5
* \| \| \| \|	Merge branch 'zk/difftool-counts'	Junio C Hamano	2013-12-27	1	-3/+17
\|\ \ \ \ \
\| * \| \| \| \|	diff.c: fix some recent whitespace style violationszk/difftool-counts	Jeff King	2013-12-16	1	-2/+2
\| * \| \| \| \|	difftool: display the number of files in the diff queue in the prompt	Zoltan Klinger	2013-12-06	1	-3/+17
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Merge branch 'cc/starts-n-ends-with'	Junio C Hamano	2013-12-17	1	-28/+28
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|
\| * \| \| \|	replace {pre,suf}fixcmp() with {starts,ends}_with()cc/starts-n-ends-with	Christian Couder	2013-12-05	1	-28/+28
\| \|/ / /
* \| \| \|	Use the word 'stuck' instead of 'sticked'	Nicolas Vigier	2013-10-31	1	-1/+1
\|/ / /
* \| \|	Merge branch 'mg/more-textconv'	Junio C Hamano	2013-10-23	1	-0/+3
\|\ \ \
\| * \| \|	diff_opt: track whether flags have been set explicitly	Junio C Hamano	2013-05-10	1	-0/+3
* \| \| \|	Merge branch 'jc/diff-filter-negation'	Junio C Hamano	2013-09-09	1	-21/+104
\|\ \ \ \ \| \| \|_\|/ \| \|/\| \|
\| * \| \|	diff: deprecate -q option to diff-filesjc/diff-filter-negation	Junio C Hamano	2013-07-19	1	-0/+8
\| * \| \|	diff: allow lowercase letter to specify what change class to exclude	Junio C Hamano	2013-07-17	1	-1/+28
\| * \| \|	diff: reject unknown change class given to --diff-filter	Junio C Hamano	2013-07-17	1	-1/+1
\| * \| \|	diff: preparse --diff-filter string argument	Junio C Hamano	2013-07-17	1	-7/+56
\| * \| \|	diff: factor out match_filter()	Junio C Hamano	2013-07-17	1	-16/+13
\| * \| \|	diff: pass the whole diff_options to diffcore_apply_filter()	Junio C Hamano	2013-07-17	1	-2/+4