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

	Commit message (Expand)	Author	Age
*	Merge branch 'mm/shortopt-detached'	Junio C Hamano	2010-08-21
\|\
\| *	log: parse separate option for --glob	Matthieu Moy	2010-08-06
\| *	log: parse separate options like git log --grep foo	Matthieu Moy	2010-08-06
\| *	diff: parse separate options like -S foo	Matthieu Moy	2010-08-06
* \|	Merge branch 'nd/fix-sparse-checkout'	Junio C Hamano	2010-08-21
\|\ \
\| * \|	unpack-trees: mark new entries skip-worktree appropriately	Nguyễn Thái Ngọc Duy	2010-08-09
\| * \|	unpack-trees: let read-tree -u remove index entries outside sparse area	Nguyễn Thái Ngọc Duy	2010-08-09
\| * \|	unpack-trees: only clear CE_UPDATE\|CE_REMOVE when skip-worktree is always set	Nguyễn Thái Ngọc Duy	2010-08-09
\| * \|	t1011 (sparse checkout): style nitpicks	Jonathan Nieder	2010-08-02
* \| \|	Merge branch 'hv/submodule-find-ff-merge'	Junio C Hamano	2010-08-21
\|\ \ \
\| * \| \|	Implement automatic fast-forward merge for submodules	Heiko Voigt	2010-07-07
* \| \| \|	Merge branch 'en/rebase-against-rebase-fix'	Junio C Hamano	2010-08-21
\|\ \ \ \
\| * \| \| \|	pull --rebase: Avoid spurious conflicts and reapplying unnecessary patches	Elijah Newren	2010-08-12
\| * \| \| \|	t5520-pull: Add testcases showing spurious conflicts from git pull --rebase	Elijah Newren	2010-08-12
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge branch 'dg/local-mod-error-messages'	Junio C Hamano	2010-08-21
\|\ \ \ \
\| * \| \| \|	t7609: test merge and checkout error messages	Diane Gasselin	2010-08-11
\| * \| \| \|	unpack_trees: group error messages by type	Matthieu Moy	2010-08-11
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge branch 'po/userdiff-csharp'	Junio C Hamano	2010-08-21
\|\ \ \ \
\| * \| \| \|	Userdiff patterns for C#	Petr Onderka	2010-08-16
\| \|/ / /
* \| \| \|	Merge branch 'maint'	Junio C Hamano	2010-08-21
\|\ \ \ \
\| * \| \| \|	t7403: add missing &&'s	Jens Lehmann	2010-08-21
\| * \| \| \|	Merge branch 'jc/maint-follow-rename-fix' into maint	Junio C Hamano	2010-08-20
\| \|\ \ \ \
\| * \ \ \ \	Merge branch 'jn/fix-abbrev' into maint	Junio C Hamano	2010-08-20
\| \|\ \ \ \ \
\| * \ \ \ \ \	Merge branch 'jn/rebase-rename-am' into maint	Junio C Hamano	2010-08-20
\| \|\ \ \ \ \ \
* \| \| \| \| \| \| \|	t9155: fix compatibility with older SVN	Eric Wong	2010-08-19
* \| \| \| \| \| \| \|	Merge branch 'jc/maint-follow-rename-fix'	Junio C Hamano	2010-08-18
\|\ \ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \|	log: test for regression introduced in v1.7.2-rc0~103^2~2	Ævar Arnfjörð Bjarmason	2010-08-15
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge branch 'cc/find-commit-subject'	Junio C Hamano	2010-08-18
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	revert: fix off by one read when searching the end of a commit subject	Christian Couder	2010-07-23
* \| \| \| \| \| \| \|	Merge branch 'jl/submodule-ignore-diff'	Junio C Hamano	2010-08-18
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Add tests for the diff.ignoreSubmodules config option	Jens Lehmann	2010-08-09
\| * \| \| \| \| \| \| \|	Submodules: Use "ignore" settings from .gitmodules too for diff and status	Jens Lehmann	2010-08-09
\| * \| \| \| \| \| \| \|	Submodules: Add the new "ignore" config option for diff and status	Jens Lehmann	2010-08-09
\| \| \|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'ml/rebase-x-strategy'	Junio C Hamano	2010-08-18
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	rebase: support -X to pass through strategy options	Mike Lundy	2010-08-03
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'jn/fix-abbrev'	Junio C Hamano	2010-08-18
\|\ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \|	archive: abbreviate substituted commit ids again	Jonathan Nieder	2010-07-27
* \| \| \| \| \| \| \|	Merge branch 'jh/use-test-must-fail'	Junio C Hamano	2010-08-18
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Convert "! git" to "test_must_fail git"	Jared Hance	2010-07-20
* \| \| \| \| \| \| \| \|	Merge branch 'jh/clean-exclude'	Junio C Hamano	2010-08-18
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Add test for git clean -e.	Jared Hance	2010-07-20
\| \|/ / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'jn/rebase-rename-am'	Junio C Hamano	2010-08-18
\|\ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	rebase: protect against diff.renames configuration	Junio C Hamano	2010-07-23
\| * \| \| \| \| \| \| \|	t3400 (rebase): whitespace cleanup	Jonathan Nieder	2010-07-23
\| * \| \| \| \| \| \| \|	Teach "apply --index-info" to handle rename patches	Junio C Hamano	2010-07-23
\| * \| \| \| \| \| \| \|	t4150 (am): futureproof against failing tests	Jonathan Nieder	2010-07-23
\| * \| \| \| \| \| \| \|	t4150 (am): style fix	Jonathan Nieder	2010-07-23
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'jn/fast-import-subtree'	Junio C Hamano	2010-08-18
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Teach fast-import to import subtrees named by tree id	Jonathan Nieder	2010-07-05
* \| \| \| \| \| \| \| \|	Merge branch 'tc/checkout-B'	Junio C Hamano	2010-08-18
\|\ \ \ \ \ \ \ \ \