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: accept color.diff.context as a synonym for "plain"	Jeff King	2015-05-27
* \|	Merge branch 'jc/diff-ws-error-highlight'	Junio C Hamano	2015-06-11
\|\ \
\| * \|	diff.c: --ws-error-highlight=<kind> option	Junio C Hamano	2015-05-26
\| * \|	diff.c: add emit_del_line() and emit_context_line()	Junio C Hamano	2015-05-26
\| \|/
* \|	Merge branch 'rs/deflate-init-cleanup'	Junio C Hamano	2015-03-17
\|\ \
\| * \|	zlib: initialize git_zstream in git_deflate_init{,_gzip,_raw}	René Scharfe	2015-03-05
* \| \|	Merge branch 'mk/diff-shortstat-dirstat-fix'	Junio C Hamano	2015-03-06
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	diff --shortstat --dirstat: remove duplicate output	Mårten Kongstad	2015-03-02
\| \|/
\| *	Merge branch 'bg/xcalloc-nmemb-then-size' into maint	Junio C Hamano	2014-07-22
\| \|\
\| * \	Merge branch 'jk/diff-follow-must-take-one-pathspec' into maint	Junio C Hamano	2014-06-25
\| \|\ \
* \| \ \	Merge branch 'jn/parse-config-slot'	Junio C Hamano	2014-10-20
\|\ \ \ \
\| * \| \| \|	color_parse: do not mention variable name in error message	Jeff King	2014-10-14
* \| \| \| \|	Merge branch 'nd/large-blobs'	Junio C Hamano	2014-09-11
\|\ \ \ \ \
\| * \| \| \| \|	diff: shortcut for diff'ing two binary SHA-1 objects	Nguyễn Thái Ngọc Duy	2014-08-18
\| * \| \| \| \|	diff --stat: mark any file larger than core.bigfilethreshold binary	Nguyễn Thái Ngọc Duy	2014-08-18
\| * \| \| \| \|	diff.c: allow to pass more flags to diff_populate_filespec	Nguyễn Thái Ngọc Duy	2014-08-18
\| \|/ / / /
* \| \| \| \|	run-command: introduce CHILD_PROCESS_INIT	René Scharfe	2014-08-20
\|/ / / /
* \| \| \|	strbuf: use strbuf_addstr() for adding C strings	René Scharfe	2014-07-17
* \| \| \|	stat_opt: check extra strlen call	Jeff King	2014-06-20
* \| \| \|	use skip_prefix to avoid repeating strings	Jeff King	2014-06-20
* \| \| \|	use skip_prefix to avoid magic numbers	Jeff King	2014-06-20
* \| \| \|	parse_diff_color_slot: drop ofs parameter	Jeff King	2014-06-18
* \| \| \|	Merge branch 'bg/xcalloc-nmemb-then-size'	Junio C Hamano	2014-06-16
\|\ \ \ \ \| \| \|_\|/ \| \|/\| \|
\| * \| \|	diff.c: rearrange xcalloc arguments	Brian Gesiak	2014-05-27
\| \|/ /
* \| \|	Merge branch 'jk/diff-follow-must-take-one-pathspec'	Junio C Hamano	2014-06-16
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	move "--follow needs one pathspec" rule to diff_setup_done	Jeff King	2014-05-20
* \| \|	Merge branch 'jk/external-diff-use-argv-array'	Junio C Hamano	2014-06-03
\|\ \ \
\| * \| \|	run_external_diff: refactor cmdline setup logic	Jeff King	2014-04-21
\| * \| \|	run_external_diff: hoist common bits out of conditional	Jeff King	2014-04-21
\| * \| \|	run_external_diff: drop fflush(NULL)	Jeff King	2014-04-21
\| * \| \|	run_external_diff: clean up error handling	Jeff King	2014-04-21
\| * \| \|	run_external_diff: use an argv_array for the environment	Jeff King	2014-04-21
* \| \| \|	Merge branch 'ks/tree-diff-nway'	Junio C Hamano	2014-06-03
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|
\| * \| \|	combine-diff: speed it up, by using multiparent diff tree-walker directly	Kirill Smelkov	2014-04-07
\| * \| \|	tree-diff: rework diff_tree() to generate diffs for multiparent cases as well	Kirill Smelkov	2014-04-07
* \| \| \|	Merge branch 'jk/external-diff-use-argv-array' (early part)	Junio C Hamano	2014-04-28
\|\ \ \ \ \| \| \|/ / \| \|/\| \|
\| * \| \|	run_external_diff: use an argv_array for the command line	Jeff King	2014-04-21
* \| \| \|	i18n: remove obsolete comments for translators in diffstat generation	Jiang Xin	2014-04-17
* \| \| \|	Merge branch 'jl/nor-or-nand-and'	Junio C Hamano	2014-04-08
\|\ \ \ \ \| \|/ / /
\| * \| \|	comments: fix misuses of "nor"	Justin Lebar	2014-03-31
\| * \| \|	Merge branch 'tr/diff-submodule-no-reuse-worktree' into maint	Junio C Hamano	2014-03-18
\| \|\ \ \
\| * \ \ \	Merge branch 'nd/diff-quiet-stat-dirty' into maint	Junio C Hamano	2014-03-18
\| \|\ \ \ \ \| \| \|_\|/ / \| \|/\| \| \|
* \| \| \| \|	Merge branch 'rm/strchrnul-not-strlen'	Junio C Hamano	2014-03-18
\|\ \ \ \ \
\| * \| \| \| \|	use strchrnul() in place of strchr() and strlen()	Rohit Mani	2014-03-10
\| \|/ / / /
* \| \| \| \|	Merge branch 'dd/use-alloc-grow'	Junio C Hamano	2014-03-18
\|\ \ \ \ \
\| * \| \| \| \|	diff.c: use ALLOC_GROW()	Dmitry S. Dolzhenko	2014-03-03
\| \|/ / / /
* \| \| \| \|	Merge branch 'tr/diff-submodule-no-reuse-worktree'	Junio C Hamano	2014-03-14
\|\ \ \ \ \ \| \| \|_\|/ / \| \|/\| \| \|
\| * \| \| \|	diff: do not reuse_worktree_file for submodules	Thomas Rast	2014-02-18