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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'bw/c-plus-plus' into ds/lazy-load-trees	Junio C Hamano	2018-04-11	1	-35/+35
\|\
\| *	diff: rename 'template' variables	Brandon Williams	2018-02-22	1	-5/+5
\| *	diff: rename 'new' variables	Brandon Williams	2018-02-22	1	-22/+22
\| *	diff: rename 'this' variables	Brandon Williams	2018-02-22	1	-8/+8
* \|	Merge branch 'nd/diff-flush-before-warning'	Junio C Hamano	2018-02-13	1	-0/+1
\|\ \
\| * \|	diff.c: flush stdout before printing rename warningsnd/diff-flush-before-warning	Nguyễn Thái Ngọc Duy	2018-01-16	1	-0/+1
\| * \|	Merge branch 'tk/diffcore-delta-remove-unused' into maint	Junio C Hamano	2016-11-29	1	-1/+1
\| \|\ \
\| * \ \	Merge branch 'rs/cocci' into maint	Junio C Hamano	2016-10-28	1	-1/+1
\| \|\ \ \
* \| \ \ \	Merge branch 'tb/crlf-conv-flags'	Junio C Hamano	2018-02-13	1	-4/+4
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \|
\| * \| \| \|	convert_to_git(): safe_crlf/checksafe becomes int conv_flagstb/crlf-conv-flags	Torsten Bögershausen	2018-01-16	1	-4/+4
* \| \| \| \|	Merge branch 'sb/diff-blobfind-pickaxe'	Junio C Hamano	2018-01-23	1	-13/+30
\|\ \ \ \ \
\| * \| \| \| \|	diff: use HAS_MULTI_BITS instead of counting bits manuallysb/diff-blobfind-pickaxe	Stefan Beller	2018-01-04	1	-10/+5
\| * \| \| \| \|	diff: properly error out when combining multiple pickaxe options	Stefan Beller	2018-01-04	1	-0/+3
\| * \| \| \| \|	diffcore: add a pickaxe option to find a specific blob	Stefan Beller	2018-01-04	1	-1/+20
\| * \| \| \| \|	diff: introduce DIFF_PICKAXE_KINDS_MASK	Stefan Beller	2018-01-04	1	-2/+2
* \| \| \| \| \|	Merge branch 'nd/ita-wt-renames-in-status'	Junio C Hamano	2018-01-23	1	-1/+1
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Use DIFF_DETECT_RENAME for detect_rename assignments	Nguyễn Thái Ngọc Duy	2017-12-27	1	-1/+1
* \| \| \| \| \|	Merge branch 'cc/skip-to-optional-val'	Junio C Hamano	2017-12-28	1	-34/+16
\|\ \ \ \ \ \
\| * \| \| \| \| \|	diff: use skip_to_optional_arg_default() in parsing --relative	Junio C Hamano	2017-12-11	1	-4/+3
\| * \| \| \| \| \|	diff: use skip_to_optional_arg_default()	Christian Couder	2017-12-11	1	-16/+4
\| * \| \| \| \| \|	diff: use skip_to_optional_arg()	Christian Couder	2017-12-11	1	-14/+9
* \| \| \| \| \| \|	Merge branch 'ar/unconfuse-three-dots'	Junio C Hamano	2017-12-19	1	-1/+7
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	diff: diff_aligned_abbrev: remove ellipsis after abbreviated SHA-1 value	Ann T Ropea	2017-12-06	1	-1/+7
* \| \| \| \| \| \| \|	Merge branch 'jt/diff-anchored-patience'	Junio C Hamano	2017-12-19	1	-2/+20
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	diff: support anchoring line(s)jt/diff-anchored-patience	Jonathan Tan	2017-11-28	1	-2/+20
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'en/rename-progress'	Junio C Hamano	2017-12-19	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	diff: remove silent clamp of renameLimit	Elijah Newren	2017-11-15	1	-1/+1
\| \| \|_\|/ / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'jc/ignore-cr-at-eol'	Junio C Hamano	2017-11-27	1	-3/+3
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	diff: --ignore-cr-at-eoljc/ignore-cr-at-eol	Junio C Hamano	2017-11-08	1	-0/+2
\| * \| \| \| \| \|	xdiff: reassign xpparm_t.flags bits	Junio C Hamano	2017-10-27	1	-3/+1
\| \| \|/ / / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'bw/diff-opt-impl-to-bitfields'	Junio C Hamano	2017-11-09	1	-87/+88
\|\ \ \ \ \ \
\| * \| \| \| \| \|	diff: make struct diff_flags members lowercasebw/diff-opt-impl-to-bitfields	Brandon Williams	2017-11-01	1	-85/+85
\| * \| \| \| \| \|	diff: remove DIFF_OPT_CLR macro	Brandon Williams	2017-11-01	1	-14/+14
\| * \| \| \| \| \|	diff: remove DIFF_OPT_SET macro	Brandon Williams	2017-11-01	1	-33/+33
\| * \| \| \| \| \|	diff: remove DIFF_OPT_TST macro	Brandon Williams	2017-11-01	1	-38/+38
\| * \| \| \| \| \|	diff: add flag to indicate textconv was set via cmdline	Brandon Williams	2017-11-01	1	-2/+3
\| * \| \| \| \| \|	diff: convert flags to be stored in bitfields	Brandon Williams	2017-11-01	1	-1/+1
* \| \| \| \| \| \|	Merge branch 'ao/diff-populate-filespec-lstat-errorpath-fix'	Junio C Hamano	2017-11-09	1	-8/+6
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	diff: fix lstat() error handling in diff_populate_filespec()ao/diff-populate-filespec-lstat-errorpath-fix	Andrey Okoshkin	2017-10-29	1	-8/+6
\| \| \|/ / / / \| \|/\| \| \| \|
* \| \| \| \| \|	diff.c: get rid of duplicate implementationsb/diff-color-moved-use-xdl-recmatch	Stefan Beller	2017-10-26	1	-78/+4
* \| \| \| \| \|	diff: handle NULs in get_string_hash()jk/diff-color-moved-fix	Jeff King	2017-10-21	1	-1/+1
* \| \| \| \| \|	diff: fix whitespace-skipping with --color-moved	Jeff King	2017-10-21	1	-5/+10
\| \|/ / / / \|/\| \| \| \|
* \| \| \| \|	Merge branch 'jk/ref-filter-colors-fix'	Junio C Hamano	2017-10-18	1	-0/+3
\|\ \ \ \ \
\| * \| \| \| \|	Revert "color: check color.ui in git_default_config()"	Jeff King	2017-10-17	1	-0/+3
* \| \| \| \| \|	Merge branch 'sb/diff-color-move'	Junio C Hamano	2017-10-17	1	-13/+15
\|\ \ \ \ \ \
\| * \| \| \| \| \|	diff: fix infinite loop with --color-moved --ignore-space-changesb/diff-color-move	Jeff King	2017-10-16	1	-13/+15
* \| \| \| \| \| \|	Merge branch 'sb/diff-color-move'	Junio C Hamano	2017-10-03	1	-0/+1
\|\ \ \ \ \ \ \ \| \|/ / / / / /
\| * \| \| \| \| \|	diff: correct newline in summary for renamed files	Stefan Beller	2017-09-28	1	-0/+1
* \| \| \| \| \| \|	Merge branch 'rj/no-sign-compare'	Junio C Hamano	2017-09-29	1	-1/+1
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	ALLOC_GROW: avoid -Wsign-compare warningsrj/no-sign-compare	Ramsay Jones	2017-09-22	1	-1/+1
\| \| \|/ / / / / \| \|/\| \| \| \| \|