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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'jc/maint-follow-rename-fix'	Junio C Hamano	2010-08-18	1	-14/+13
\|\
\| *	diff --follow: do call diffcore_std() as necessary	Junio C Hamano	2010-08-13	1	-14/+13
* \|	Merge branch 'jl/submodule-ignore-diff'	Junio C Hamano	2010-08-18	1	-7/+34
\|\ \ \| \|/ \|/\|
\| *	Add the 'diff.ignoreSubmodules' config setting	Johannes Schindelin	2010-08-09	1	-1/+5
\| *	Submodules: Add the new "ignore" config option for diff and status	Jens Lehmann	2010-08-09	1	-6/+29
* \|	diff: strip extra "/" when stripping prefix	Jakub Narebski	2010-08-11	1	-2/+8
* \|	Merge branch 'sv/maint-diff-q-clear-fix' into maint	Junio C Hamano	2010-08-03	1	-1/+0
\|\ \ \| \|/ \|/\|
\| *	Fix DIFF_QUEUE_CLEAR refactoring	Junio C Hamano	2010-08-02	1	-1/+0
* \|	diff.c: fix a graph output bug	Bo Yang	2010-07-08	1	-2/+1
* \|	Merge branch 'jl/status-ignore-submodules'	Junio C Hamano	2010-06-30	1	-11/+4
\|\ \
\| * \|	Add the option "--ignore-submodules" to "git status"	Jens Lehmann	2010-06-25	1	-11/+4
* \| \|	Merge branch 'jl/maint-diff-ignore-submodules'	Junio C Hamano	2010-06-30	1	-1/+10
\|\ \ \ \| \|/ /
\| * \|	Add optional parameters to the diff option "--ignore-submodules"	Jens Lehmann	2010-06-11	1	-1/+10
* \| \|	Merge branch 'ab/blame-textconv'	Junio C Hamano	2010-06-27	1	-8/+4
\|\ \ \
\| * \| \|	textconv: make the API public	Axel Bonnet	2010-06-11	1	-8/+4
* \| \| \|	Merge branch 'maint'	Junio C Hamano	2010-06-22	1	-1/+0
\|\ \ \ \
\| * \ \ \	Merge branch 'cc/maint-diff-CC-binary' into maint	Junio C Hamano	2010-06-22	1	-5/+16
\| \|\ \ \ \
\| * \ \ \ \	Merge branch 'bw/diff-metainfo-color' into maint	Junio C Hamano	2010-06-21	1	-26/+35
\| \|\ \ \ \ \
\| * \ \ \ \ \	Merge branch 'rs/diff-no-minimal' into maint	Junio C Hamano	2010-06-21	1	-5/+5
\| \|\ \ \ \ \ \ \| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'cc/maint-diff-CC-binary'	Junio C Hamano	2010-06-18	1	-5/+16
\|\ \ \ \ \ \ \ \| \| \|_\|_\|/ / / \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	diff: fix "git show -C -C" output when renaming a binary file	Christian Couder	2010-06-06	1	-6/+17
* \| \| \| \| \| \|	Merge branch 'by/diff-graph'	Junio C Hamano	2010-06-18	1	-97/+312
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Make --color-words work well with --graph	Bo Yang	2010-05-31	1	-17/+104
\| * \| \| \| \| \| \|	Emit a whole line in one go	Bo Yang	2010-05-31	1	-5/+27
\| * \| \| \| \| \| \|	diff.c: Output the text graph padding before each diff line	Bo Yang	2010-05-31	1	-53/+147
\| * \| \| \| \| \| \|	Add a prefix output callback to diff output	Bo Yang	2010-05-31	1	-27/+35
\| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'jh/diff-index-line-abbrev'	Junio C Hamano	2010-06-18	1	-3/+3
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	diff.c: Ensure "index $from..$to" line contains unambiguous SHA1s	Johan Herland	2010-05-31	1	-3/+3
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge branch 'ec/diff-noprefix-config'	Junio C Hamano	2010-06-18	1	-1/+8
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	diff: add configuration option for disabling diff prefixes.	Eli Collins	2010-05-18	1	-1/+8
* \| \| \| \| \| \| \|	Merge branch 'bw/diff-metainfo-color'	Junio C Hamano	2010-06-13	1	-26/+35
\|\ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \|	diff: fix coloring of extended diff headers	Bert Wesarg	2010-05-19	1	-26/+35
* \| \| \| \| \| \| \|	Merge branch 'rs/diff-no-minimal'	Junio C Hamano	2010-06-13	1	-5/+5
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| / / \| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	git diff too slow for a file	René Scharfe	2010-05-02	1	-5/+5
* \| \| \| \| \| \|	Merge branch 'by/log-follow'	Junio C Hamano	2010-05-21	1	-8/+13
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Make diffcore_std only can run once before a diff_flush	Bo Yang	2010-05-07	1	-0/+8
\| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	Add a macro DIFF_QUEUE_CLEAR.	Bo Yang	2010-05-07	1	-8/+5
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'tr/word-diff'	Junio C Hamano	2010-05-21	1	-19/+120
\|\ \ \ \ \ \
\| * \| \| \| \| \|	diff: add --word-diff option that generalizes --color-words	Thomas Rast	2010-04-14	1	-19/+120
* \| \| \| \| \| \|	diff-options: make --patch a synonym for -p	Will Palmer	2010-05-18	1	-1/+1
\| \|_\|_\|_\|/ / \|/\| \| \| \| \|
* \| \| \| \| \|	Merge branch 'jk/cached-textconv'	Junio C Hamano	2010-05-08	1	-46/+73
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|
\| * \| \| \| \|	diff: avoid useless filespec population	Jeff King	2010-04-02	1	-5/+4
\| * \| \| \| \|	diff: cache textconv output	Jeff King	2010-04-02	1	-9/+43
\| * \| \| \| \|	textconv: refactor calls to run_textconv	Jeff King	2010-04-02	1	-36/+30
* \| \| \| \| \|	Merge branch 'maint-1.7.0' into maint	Junio C Hamano	2010-05-04	1	-10/+5
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| / \| \| \|_\|_\|/ \| \|/\| \| \|
\| * \| \| \|	remove ecb parameter from xdi_diff_outf()	René Scharfe	2010-05-04	1	-10/+5
\| \| \|_\|/ \| \|/\| \|
\| * \| \|	Merge branch 'jk/maint-diffstat-overflow' into maint	Junio C Hamano	2010-04-22	1	-9/+12
\| \|\ \ \
\| * \ \ \	Merge branch 'jc/conflict-marker-size' into maint	Junio C Hamano	2010-04-09	1	-13/+11
\| \|\ \ \ \
* \| \ \ \ \	Merge branch 'jk/maint-diffstat-overflow'	Junio C Hamano	2010-04-18	1	-9/+12
\|\ \ \ \ \ \ \| \| \|_\|/ / / \| \|/\| \| \| \|
\| * \| \| \| \|	diff: use large integers for diffstat calculations	Jeff King	2010-04-17	1	-9/+12