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

	Commit message (Expand)	Author	Age
*	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
\| * \| \| \|	diff: parse separate options like -S foo	Matthieu Moy	2010-08-06
\| \|/ / /
* \| \| \|	Merge branch 'jc/maint-follow-rename-fix'	Junio C Hamano	2010-08-18
\|\ \ \ \ \| \| \|/ / \| \|/\| \|
\| * \| \|	diff --follow: do call diffcore_std() as necessary	Junio C Hamano	2010-08-13
* \| \| \|	Merge branch 'jl/submodule-ignore-diff'	Junio C Hamano	2010-08-18
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Add the 'diff.ignoreSubmodules' config setting	Johannes Schindelin	2010-08-09
\| * \| \|	Submodules: Add the new "ignore" config option for diff and status	Jens Lehmann	2010-08-09
\| \|/ /
* \| \|	diff: strip extra "/" when stripping prefix	Jakub Narebski	2010-08-11
* \| \|	Merge branch 'sv/maint-diff-q-clear-fix' into maint	Junio C Hamano	2010-08-03
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Fix DIFF_QUEUE_CLEAR refactoring	Junio C Hamano	2010-08-02
* \| \|	diff.c: fix a graph output bug	Bo Yang	2010-07-08
* \| \|	Merge branch 'jl/status-ignore-submodules'	Junio C Hamano	2010-06-30
\|\ \ \
\| * \| \|	Add the option "--ignore-submodules" to "git status"	Jens Lehmann	2010-06-25
* \| \| \|	Merge branch 'jl/maint-diff-ignore-submodules'	Junio C Hamano	2010-06-30
\|\ \ \ \ \| \|/ / / \| \| \| / \| \|_\|/ \|/\| \|
\| * \|	Add optional parameters to the diff option "--ignore-submodules"	Jens Lehmann	2010-06-11
* \| \|	Merge branch 'ab/blame-textconv'	Junio C Hamano	2010-06-27
\|\ \ \
\| * \| \|	textconv: make the API public	Axel Bonnet	2010-06-11
* \| \| \|	Merge branch 'maint'	Junio C Hamano	2010-06-22
\|\ \ \ \
\| * \ \ \	Merge branch 'cc/maint-diff-CC-binary' into maint	Junio C Hamano	2010-06-22
\| \|\ \ \ \
\| * \ \ \ \	Merge branch 'bw/diff-metainfo-color' into maint	Junio C Hamano	2010-06-21
\| \|\ \ \ \ \
\| * \ \ \ \ \	Merge branch 'rs/diff-no-minimal' into maint	Junio C Hamano	2010-06-21
\| \|\ \ \ \ \ \ \| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'cc/maint-diff-CC-binary'	Junio C Hamano	2010-06-18
\|\ \ \ \ \ \ \ \| \| \|_\|_\|/ / / \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	diff: fix "git show -C -C" output when renaming a binary file	Christian Couder	2010-06-06
* \| \| \| \| \| \|	Merge branch 'by/diff-graph'	Junio C Hamano	2010-06-18
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Make --color-words work well with --graph	Bo Yang	2010-05-31
\| * \| \| \| \| \| \|	Emit a whole line in one go	Bo Yang	2010-05-31
\| * \| \| \| \| \| \|	diff.c: Output the text graph padding before each diff line	Bo Yang	2010-05-31
\| * \| \| \| \| \| \|	Add a prefix output callback to diff output	Bo Yang	2010-05-31
\| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'jh/diff-index-line-abbrev'	Junio C Hamano	2010-06-18
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	diff.c: Ensure "index $from..$to" line contains unambiguous SHA1s	Johan Herland	2010-05-31
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge branch 'ec/diff-noprefix-config'	Junio C Hamano	2010-06-18
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	diff: add configuration option for disabling diff prefixes.	Eli Collins	2010-05-18
* \| \| \| \| \| \| \|	Merge branch 'bw/diff-metainfo-color'	Junio C Hamano	2010-06-13
\|\ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \|	diff: fix coloring of extended diff headers	Bert Wesarg	2010-05-19
* \| \| \| \| \| \| \|	Merge branch 'rs/diff-no-minimal'	Junio C Hamano	2010-06-13
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| / / \| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \|