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

	Commit message (Expand)	Author	Age
*	Merge branch 'kw/patch-ids-optim'	Junio C Hamano	2016-08-12
\|\
\| *	patch-ids: add flag to create the diff patch id using header only data	Kevin Willford	2016-07-29
* \|	Merge branch 'jk/diff-do-not-reuse-wtf-needs-cleaning'	Junio C Hamano	2016-08-03
\|\ \
\| * \|	diff: do not reuse worktree files that need "clean" conversion	Jeff King	2016-07-22
* \| \|	Merge branch 'bc/cocci'	Junio C Hamano	2016-07-19
\|\ \ \
\| * \| \|	diff: convert prep_temp_blob() to struct object_id	brian m. carlson	2016-06-28
\| * \| \|	diff: rename struct diff_filespec's sha1_valid member	brian m. carlson	2016-06-28
\| * \| \|	diff: convert struct diff_filespec to struct object_id	brian m. carlson	2016-06-28
\| * \| \|	coccinelle: convert hashcpy() with null_sha1 to hashclr()	brian m. carlson	2016-06-28
\| \| \|/ \| \|/\|
* \| \|	diff: do not color output when --color=auto and --output=<file> is given	Johannes Schindelin	2016-06-28
\|/ /
* \|	Merge branch 'jk/diff-compact-heuristic'	Junio C Hamano	2016-06-10
\|\ \
\| * \|	diff: disable compaction heuristic for now	Junio C Hamano	2016-06-10
* \| \|	Merge branch 'jk/diff-compact-heuristic'	Junio C Hamano	2016-05-06
\|\ \ \ \| \|/ /
\| * \|	xdiff: implement empty line chunk heuristic	Stefan Beller	2016-04-19
* \| \|	Merge branch 'mm/diff-renames-default'	Junio C Hamano	2016-04-03
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	diff: activate diff.renames by default	Matthieu Moy	2016-02-25
* \| \|	Merge branch 'jk/tighten-alloc'	Junio C Hamano	2016-02-26
\|\ \ \
\| * \| \|	diff_populate_gitlink: use a strbuf	Jeff King	2016-02-22
\| * \| \|	convert trivial cases to FLEX_ARRAY macros	Jeff King	2016-02-22
\| * \| \|	Merge branch 'nd/diff-with-path-params' into maint	Junio C Hamano	2016-02-05
\| \|\ \ \
* \| \ \ \	Merge branch 'jk/more-comments-on-textconv'	Junio C Hamano	2016-02-26
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \|
\| * \| \| \|	diff: clarify textconv interface	Jeff King	2016-02-22
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge branch 'nd/diff-with-path-params'	Junio C Hamano	2016-02-03
\|\ \ \ \ \| \|_\|/ / \|/\| \| / \| \| \|/ \| \|/\|
\| * \|	diff: make -O and --output work in subdirectory	Duy Nguyen	2016-01-21
* \| \|	Merge branch 'tk/sigchain-unnecessary-post-tempfile'	Junio C Hamano	2015-10-29
\|\ \ \
\| * \| \|	diff: remove unused #include "sigchain.h"	Tobias Klauser	2015-10-22
* \| \| \|	Merge branch 'jk/war-on-sprintf'	Junio C Hamano	2015-10-20
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|
\| * \| \|	use sha1_to_hex_r() instead of strcpy	Jeff King	2015-10-05
\| * \| \|	convert trivial sprintf / strcpy calls to xsnprintf	Jeff King	2015-09-25
* \| \| \|	Sync with v2.5.4	Junio C Hamano	2015-09-28
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Sync with 2.4.10	Junio C Hamano	2015-09-28
\| \|\ \ \ \| \| \| \|/ \| \| \|/\|
\| \| * \|	Sync with 2.3.10	Junio C Hamano	2015-09-28
\| \| \|\ \
\| \| \| * \|	react to errors in xdi_diff	Jeff King	2015-09-28
\| \| \| * \|	Merge branch 'rs/deflate-init-cleanup' into maint	Junio C Hamano	2015-03-23
\| \| \| \|\ \
\| \| \| * \ \	Merge branch 'mk/diff-shortstat-dirstat-fix' into maint	Junio C Hamano	2015-03-13
\| \| \| \|\ \ \
\| \| * \| \ \ \	Merge branch 'jk/color-diff-plain-is-context' into maint	Junio C Hamano	2015-06-25
\| \| \|\ \ \ \ \
* \| \| \ \ \ \ \	Merge branch 'hv/submodule-config'	Junio C Hamano	2015-08-31
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	submodule: use new config API for worktree configurations	Heiko Voigt	2015-08-19
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'mh/tempfile'	Junio C Hamano	2015-08-25
\|\ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \|	diff: use tempfile module	Michael Haggerty	2015-08-12
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge branch 'dt/log-follow-config'	Junio C Hamano	2015-08-03
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	log: add "log.follow" configuration variable	David Turner	2015-07-09
* \| \| \| \| \| \|	Merge branch 'jc/diff-ws-error-highlight'	Junio C Hamano	2015-07-15
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	diff: parse ws-error-highlight option more strictly	René Scharfe	2015-07-12
* \| \| \| \| \| \|	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
\| \|/ / /