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

	Commit message (Expand)	Author	Age
*	Merge branch 'jc/fix-diff-files-unmerged' into maint	Junio C Hamano	2011-05-13
\|\
\| *	diff: remove often unused parameters from diff_unmerge()	Junio C Hamano	2011-04-23
\| *	diff.c: return filepair from diff_unmerge()	Junio C Hamano	2011-04-23
* \|	Merge branch 'jh/dirstat' into maint	Junio C Hamano	2011-05-04
\|\ \
\| * \|	--dirstat: In case of renames, use target filename instead of source filename	Johan Herland	2011-04-12
\| * \|	Teach --dirstat not to completely ignore rearranged lines within a file	Johan Herland	2011-04-11
\| * \|	--dirstat-by-file: Make it faster and more correct	Johan Herland	2011-04-11
* \| \|	Remove unused variables	Johannes Schindelin	2011-03-22
* \| \|	Fix sparse warnings	Stephen Boyd	2011-03-22
* \| \|	Merge branch 'jk/merge-rename-ux'	Junio C Hamano	2011-03-19
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	bump rename limit defaults (again)	Jeff King	2011-02-21
* \| \|	Merge branch 'jk/diffstat-binary' into maint	Junio C Hamano	2011-03-16
\|\ \ \
\| * \| \|	diff: don't retrieve binary blobs for diffstat	Jeff King	2011-02-22
\| * \| \|	diff: handle diffstat of rewritten binary files	Jeff King	2011-02-22
* \| \| \|	standardize brace placement in struct definitions	Jonathan Nieder	2011-03-16
\| \|/ / \|/\| \|
* \| \|	Merge branch 'ks/blame-worktree-textconv-cached'	Junio C Hamano	2010-12-21
\|\ \ \
\| * \| \|	fill_textconv(): Don't get/put cache if sha1 is not valid	Kirill Smelkov	2010-12-19
\| * \| \|	Merge branch 'np/diff-in-corrupt-repository' into maint	Junio C Hamano	2010-12-09
\| \|\ \ \
\| * \ \ \	Merge branch 'cm/diff-check-at-eol' into maint	Junio C Hamano	2010-12-09
\| \|\ \ \ \
\| * \ \ \ \	Merge branch 'cb/diff-fname-optim' into maint	Junio C Hamano	2010-11-24
\| \|\ \ \ \ \
\| * \ \ \ \ \	Merge branch 'jk/no-textconv-symlink' into maint	Junio C Hamano	2010-11-24
\| \|\ \ \ \ \ \
* \| \ \ \ \ \ \	Merge branch 'kb/diff-C-M-synonym'	Junio C Hamano	2010-12-16
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	diff: use "find" instead of "detect" as prefix for long forms of -M and -C	Yann Dirson	2010-12-10
\| * \| \| \| \| \| \| \|	diff: add --detect-copies-harder as a synonym for --find-copies-harder	Kevin Ballard	2010-11-29
* \| \| \| \| \| \| \| \|	Merge branch 'jk/diff-CBM'	Junio C Hamano	2010-12-08
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	diff: report bogus input to -C/-M/-B	Jeff King	2010-10-21
* \| \| \| \| \| \| \| \| \|	Merge branch 'np/diff-in-corrupt-repository'	Junio C Hamano	2010-11-29
\|\ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	diff: don't presume empty file when corresponding object is missing	Nicolas Pitre	2010-10-21
\| \| \|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'cm/diff-check-at-eol'	Junio C Hamano	2010-11-29
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / \|/\| \| \| \| \| \| / / \| \| \|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \|	diff --check: correct line numbers of new blank lines at EOF	Christoph Mallon	2010-10-16
* \| \| \| \| \| \| \|	Merge branch 'cb/diff-fname-optim'	Junio C Hamano	2010-11-17
\|\ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \|	do not search functions for patch ID	Clemens Buchacher	2010-09-23
* \| \| \| \| \| \| \|	Merge branch 'jk/no-textconv-symlink'	Junio C Hamano	2010-11-17
\|\ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \|	diff: don't use pathname-based diff drivers for symlinks	Jeff King	2010-09-23
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge branch 'kb/merge-recursive-rename-threshold'	Junio C Hamano	2010-10-26
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	diff: add synonyms for -M, -C, -B	Kevin Ballard	2010-09-29
\| * \| \| \| \| \| \|	merge-recursive: option to specify rename threshold	Kevin Ballard	2010-09-29
* \| \| \| \| \| \| \|	Merge branch 'maint'	Junio C Hamano	2010-10-26
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| / / \| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	Fix copy-pasted comments related to tree diff handling.	Yann Dirson	2010-10-25
* \| \| \| \| \| \|	Merge branch 'jc/pickaxe-grep'	Junio C Hamano	2010-09-29
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	git log/diff: add -G<regexp> that greps in the patch text	Junio C Hamano	2010-08-31
\| * \| \| \| \| \|	diff: pass the entire diff-options to diffcore_pickaxe()	Junio C Hamano	2010-08-31
* \| \| \| \| \| \|	diff: trivial fix for --output file error message	Matthieu Moy	2010-09-29
\| \|_\|_\|_\|_\|/ \|/\| \| \| \| \|
* \| \| \| \| \|	Merge branch 'maint'	Junio C Hamano	2010-09-09
\|\ \ \ \ \ \ \| \| \|_\|/ / / \| \|/\| \| \| \|
\| * \| \| \| \|	diff.c: call regfree to free memory allocated by regcomp when necessary	Brandon Casey	2010-09-09
* \| \| \| \| \|	Merge branch 'cb/binary-patch-id'	Junio C Hamano	2010-08-31
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|
\| * \| \| \| \|	hash binary sha1 into patch id	Clemens Buchacher	2010-08-16
* \| \| \| \| \|	Merge branch 'mm/shortopt-detached'	Junio C Hamano	2010-08-21
\|\ \ \ \ \ \
\| * \| \| \| \| \|	diff: parse separate options --stat-width n, --stat-name-width n	Matthieu Moy	2010-08-06
\| * \| \| \| \| \|	diff: split off a function for --stat-* option parsing	Jonathan Nieder	2010-08-06