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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'maint-1.6.2' into maint-1.6.3	Junio C Hamano	2010-01-18	1	-0/+2
\|\
\| *	Merge branch 'maint-1.6.1' into maint-1.6.2	Junio C Hamano	2010-01-10	1	-0/+2
\| \|\
\| \| *	textconv: stop leaking file descriptors	Jeff King	2009-12-30	1	-0/+2
\| \| *	Merge branch 'jc/maint-1.6.0-keep-pack' into maint-1.6.1	Junio C Hamano	2009-05-03	1	-1/+1
\| \| \|\
\| \| * \	Merge branch 'jc/maint-1.6.0-diff-borrow-carefully' into maint-1.6.1	Junio C Hamano	2009-05-03	1	-1/+9
\| \| \|\ \
\| * \| \ \	Merge branch 'jc/maint-1.6.0-diff-borrow-carefully' into maint	Junio C Hamano	2009-04-08	1	-1/+9
\| \|\ \ \ \ \| \| \| \|/ / \| \| \|/\| \|
\| * \| \| \|	Merge branch 'jc/maint-1.6.0-keep-pack' into maint	Junio C Hamano	2009-04-08	1	-1/+1
\| \|\ \ \ \ \| \| \| \|_\|/ \| \| \|/\| \|
* \| \| \| \|	diff.c: plug a memory leak in an error path	Johannes Sixt	2009-06-08	1	-0/+1
* \| \| \| \|	Merge branch 'ar/unlink-err' into maint	Junio C Hamano	2009-05-25	1	-1/+1
\|\ \ \ \ \
\| * \| \| \| \|	replace direct calls to unlink(2) with unlink_or_warn	Alex Riesen	2009-04-29	1	-1/+1
* \| \| \| \| \|	Fix a bunch of pointer declarations (codestyle)	Felipe Contreras	2009-05-01	1	-2/+2
\|/ / / / /
* \| \| \| \|	Allow users to un-configure rename detection	Linus Torvalds	2009-04-11	1	-7/+10
* \| \| \| \|	Merge branch 'jc/maint-1.6.0-diff-borrow-carefully'	Junio C Hamano	2009-03-28	1	-1/+9
\|\ \ \ \ \ \| \| \|_\|/ / \| \|/\| \| \|
\| * \| \| \|	diff --cached: do not borrow from a work tree when a path is marked as assume...	Junio C Hamano	2009-03-22	1	-1/+9
* \| \| \| \|	Merge branch 'js/maint-diff-temp-smudge'	Junio C Hamano	2009-03-26	1	-3/+10
\|\ \ \ \ \ \| \| \|/ / / \| \|/\| \| \|
\| * \| \| \|	Smudge the files fed to external diff and textconv	Johannes Schindelin	2009-03-22	1	-3/+10
* \| \| \| \|	Merge branch 'jc/maint-1.6.0-keep-pack'	Junio C Hamano	2009-03-11	1	-1/+1
\|\ \ \ \ \ \| \| \|_\|/ / \| \|/\| \| \|
\| * \| \| \|	has_sha1_pack(): refactor "pretend these packs do not exist" interface	Junio C Hamano	2009-02-28	1	-1/+1
* \| \| \| \|	Remove unused function scope local variables	Benjamin Kramer	2009-03-07	1	-3/+1
* \| \| \| \|	Merge branch 'al/ansi-color'	Junio C Hamano	2009-03-05	1	-8/+8
\|\ \ \ \ \
\| * \| \| \| \|	Clean up use of ANSI color sequences	Arjen Laarhoven	2009-02-13	1	-8/+8
* \| \| \| \| \|	Use DIFF_XDL_SET/DIFF_OPT_SET instead of raw bit-masking	Keith Cascio	2009-03-04	1	-7/+10
\| \|_\|/ / / \|/\| \| \| \|
* \| \| \| \|	Remove redundant bit clears from diff_setup()	Keith Cascio	2009-02-13	1	-3/+0
\|/ / / /
* \| \| \|	Bugfix: GIT_EXTERNAL_DIFF with more than one changed files	Nazri Ramliy	2009-02-12	1	-4/+4
* \| \| \|	Merge branch 'jc/maint-split-diff-metainfo'	Junio C Hamano	2009-01-31	1	-66/+80
\|\ \ \ \ \| \| \|_\|/ \| \|/\| \|
\| * \| \|	Merge branch 'jc/maint-1.6.0-split-diff-metainfo' into jc/maint-split-diff-me...	Junio C Hamano	2009-01-27	1	-66/+80
\| \|\ \ \
\| \| * \| \|	diff.c: output correct index lines for a split diff	Junio C Hamano	2009-01-27	1	-66/+80
\| \| \|/ /
* \| \| \|	Merge branch 'jk/signal-cleanup'	Junio C Hamano	2009-01-31	1	-52/+56
\|\ \ \ \
\| * \| \| \|	refactor signal handling for cleanup functions	Jeff King	2009-01-21	1	-1/+1
\| * \| \| \|	chain kill signals for cleanup functions	Jeff King	2009-01-21	1	-2/+3
\| * \| \| \|	diff: refactor tempfile cleanup handling	Jeff King	2009-01-21	1	-52/+55
* \| \| \| \|	Merge branch 'js/diff-color-words'	Junio C Hamano	2009-01-25	1	-70/+155
\|\ \ \ \ \
\| * \| \| \| \|	color-words: Support diff.wordregex config option	Boyd Stephen Smith Jr	2009-01-21	1	-0/+5
\| * \| \| \| \|	color-words: make regex configurable via attributes	Thomas Rast	2009-01-17	1	-0/+10
\| * \| \| \| \|	color-words: enable REG_NEWLINE to help user	Thomas Rast	2009-01-17	1	-1/+2
\| * \| \| \| \|	color-words: take an optional regular expression describing words	Johannes Schindelin	2009-01-17	1	-9/+55
\| * \| \| \| \|	color-words: change algorithm to allow for 0-character word boundaries	Johannes Schindelin	2009-01-17	1	-66/+91
\| * \| \| \| \|	color-words: refactor word splitting and use ALLOC_GROW()	Johannes Schindelin	2009-01-17	1	-21/+19
\| \|/ / / /
* \| \| \| \|	Merge branch 'js/patience-diff'	Junio C Hamano	2009-01-23	1	-0/+2
\|\ \ \ \ \
\| * \| \| \| \|	Introduce the diff option '--patience'	Johannes Schindelin	2009-01-07	1	-0/+2
* \| \| \| \| \|	Merge branch 'maint'	Junio C Hamano	2009-01-21	1	-1/+3
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| / / / \| \| \|/ / / \| \|/\| \| \|
\| * \| \| \|	Rename diff.suppress-blank-empty to diff.suppressBlankEmpty	Johannes Schindelin	2009-01-21	1	-1/+3
\| \|/ / /
* \| \| \|	Merge branch 'rs/diff-ihc'	Junio C Hamano	2009-01-07	1	-0/+4
\|\ \ \ \
\| * \| \| \|	diff: add option to show context between close hunks	René Scharfe	2008-12-29	1	-0/+4
\| \|/ / /
* \| \| \|	remove trailing LF in die() messages	Alexander Potashev	2009-01-05	1	-1/+1
\|/ / /
* \| \|	Fix type-mismatch compiler warning from diff_populate_filespec()	René Scharfe	2008-12-18	1	-1/+2
* \| \|	Make 'prepare_temp_file()' ignore st_size for symlinks	Linus Torvalds	2008-12-17	1	-5/+4
* \| \|	Make 'diff_populate_filespec()' use the new 'strbuf_readlink()'	Linus Torvalds	2008-12-17	1	-9/+7
* \| \|	diff: respect textconv in rewrite diffs	Jeff King	2008-12-09	1	-12/+36
* \| \|	diff: fix handling of binary rewrite diffs	Jeff King	2008-12-09	1	-1/+3