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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'jc/maint-diff-core-safecrlf' into maint	Junio C Hamano	2013-07-21	1	-1/+9
\|\
\| *	diff: demote core.safecrlf=true to core.safecrlf=warn	Junio C Hamano	2013-06-25	1	-1/+9
* \|	Merge branch 'jk/diff-graph-submodule-summary'	Junio C Hamano	2013-04-15	1	-0/+1
\|\ \
\| * \|	submodule: print graph output next to submodule log	John Keeping	2013-04-05	1	-0/+1
\| * \|	Merge branch 'ap/maint-diff-rename-avoid-overlap'	Junio C Hamano	2013-03-25	1	-1/+13
\| \|\ \
* \| \ \	Merge branch 'jk/diff-algo-finishing-touches'	Junio C Hamano	2013-04-15	1	-2/+3
\|\ \ \ \
\| * \| \| \|	diff: allow unstuck arguments with --diff-algorithm	John Keeping	2013-04-05	1	-2/+3
* \| \| \| \|	Correct common spelling mistakes in comments and tests	Stefano Lattarini	2013-04-12	1	-1/+1
* \| \| \| \|	Merge branch 'ap/maint-diff-rename-avoid-overlap' into maint	Junio C Hamano	2013-04-01	1	-1/+13
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| / / \| \| \|/ / \| \|/\| \|
\| * \| \|	diff: prevent pprint_rename from underrunning input	Thomas Rast	2013-02-26	1	-7/+10
\| * \| \|	diff: Fix rename pretty-print when suffix and prefix overlap	Antoine Pelisse	2013-02-23	1	-1/+10
* \| \| \|	diff.c: diff.renamelimit => diff.renameLimit in message	Max Nanasy	2013-03-21	1	-1/+1
* \| \| \|	Merge branch 'mp/diff-algo-config'	Junio C Hamano	2013-02-17	1	-0/+34
\|\ \ \ \ \| \| \|/ / \| \|/\| \|
\| * \| \|	diff: Introduce --diff-algorithm command line option	Michal Privoznik	2013-01-16	1	-1/+11
\| * \| \|	config: Introduce diff.algorithm variable	Michal Privoznik	2013-01-16	1	-0/+24
* \| \| \|	Merge branch 'jk/diff-graph-cleanup'	Junio C Hamano	2013-02-14	1	-97/+34
\|\ \ \ \
\| * \| \| \|	diff.c: use diff_line_prefix() where applicable	John Keeping	2013-02-12	1	-95/+20
\| * \| \| \|	diff: add diff_line_prefix function	John Keeping	2013-02-12	1	-0/+10
\| * \| \| \|	diff.c: make constant string arguments const	John Keeping	2013-02-12	1	-2/+4
\| * \| \| \|	diff: write prefix to the correct file	John Keeping	2013-02-12	1	-1/+1
\| \|/ / /
* \| \| \|	Merge branch 'jc/blame-no-follow'	Junio C Hamano	2013-01-14	1	-0/+2
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	diff: accept --no-follow option	Junio C Hamano	2012-09-21	1	-0/+2
* \| \| \|	Merge branch 'lt/diff-stat-show-0-lines'	Junio C Hamano	2012-11-29	1	-25/+29
\|\ \ \ \
\| * \| \| \|	diff --shortstat: do not count "unmerged" entries	Junio C Hamano	2012-11-27	1	-3/+2
\| * \| \| \|	diff --stat: do not count "unmerged" entries	Junio C Hamano	2012-11-27	1	-2/+4
\| * \| \| \|	diff --stat: move the "total count" logic to the last loop	Junio C Hamano	2012-11-27	1	-9/+12
\| * \| \| \|	diff --stat: use "file" temporary variable to refer to data->files[i]	Junio C Hamano	2012-11-27	1	-13/+13
\| * \| \| \|	diff --stat: status of unmodified pair in diff-q is not zero	Junio C Hamano	2012-11-27	1	-1/+1
* \| \| \| \|	Merge branch 'rr/submodule-diff-config'	Junio C Hamano	2012-11-25	1	-11/+35
\|\ \ \ \ \
\| * \| \| \| \|	submodule: display summary header in bold	Ramkumar Ramachandra	2012-11-18	1	-1/+1
\| * \| \| \| \|	diff: rename "set" variable	Jeff King	2012-11-18	1	-6/+6
\| * \| \| \| \|	diff: introduce diff.submodule configuration variable	Ramkumar Ramachandra	2012-11-18	1	-4/+28
* \| \| \| \| \|	Merge branch 'lt/diff-stat-show-0-lines'	Junio C Hamano	2012-11-25	1	-10/+15
\|\ \ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \|
\| * \| \| \| \|	Fix "git diff --stat" for interesting - but empty - file changes	Linus Torvalds	2012-10-17	1	-10/+15
* \| \| \| \| \|	Merge branch 'nd/builtin-to-libgit'	Jeff King	2012-11-09	1	-0/+16
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Move setup_diff_pager to libgit.a	Nguyễn Thái Ngọc Duy	2012-10-29	1	-0/+16
\| \| \|/ / / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'mh/maint-parse-dirstat-fix'	Jeff King	2012-11-09	1	-19/+21
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	parse_dirstat_params(): use string_list to split comma-separated string	Michael Haggerty	2012-10-29	1	-19/+21
\| \| \|_\|_\|/ \| \|/\| \| \|
\| * \| \| \|	Merge branch 'nd/maint-diffstat-summary' into maint	Junio C Hamano	2012-09-20	1	-6/+4
\| \|\ \ \ \
\| * \ \ \ \	Sync with 1.7.11.6	Junio C Hamano	2012-09-11	1	-3/+2
\| \|\ \ \ \ \ \| \| \| \|_\|/ / \| \| \|/\| \| \|
\| \| * \| \| \|	Merge branch 'ab/diff-write-incomplete-line' into maint-1.7.11	Junio C Hamano	2012-09-11	1	-0/+1
\| \| \|\ \ \ \
\| \| * \ \ \ \	Merge branch 'tr/void-diff-setup-done' into maint-1.7.11	Junio C Hamano	2012-09-11	1	-3/+1
\| \| \|\ \ \ \ \
\| * \| \ \ \ \ \	Merge branch 'maint-1.7.11' into maint	Junio C Hamano	2012-09-10	1	-6/+10
\| \|\ \ \ \ \ \ \ \| \| \|/ / / / / /
\| \| * \| \| \| \| \|	Merge branch 'jk/maint-null-in-trees' into maint-1.7.11	Junio C Hamano	2012-09-10	1	-6/+10
\| \| \|\ \ \ \ \ \
* \| \| \| \| \| \| \| \|	diff: diff.context configuration gives default to -U	Jeff Muizelaar	2012-09-30	1	-1/+8
\| \|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'jc/make-static'	Junio C Hamano	2012-09-18	1	-1/+1
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	diff.c: mark a private file-scope symbol as static	Junio C Hamano	2012-09-15	1	-1/+1
* \| \| \| \| \| \| \| \|	Merge branch 'nd/maint-diffstat-summary'	Junio C Hamano	2012-09-17	1	-6/+4
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| / / \| \| \|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \|	Revert diffstat back to English	Nguyễn Thái Ngọc Duy	2012-09-14	1	-6/+4
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge branch 'ab/diff-write-incomplete-line'	Junio C Hamano	2012-08-27	1	-0/+1
\|\ \ \ \ \ \ \ \| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \|