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

	Commit message (Expand)	Author	Age
*	Merge git://git.bogomips.org/git-svn	Junio C Hamano	2010-01-23
\|\
\| *	git-svn: allow subset of branches/tags to be specified in glob spec	Jay Soffian	2010-01-23
\| *	git-svn: allow UUID to be manually remapped via rewriteUUID	Jay Soffian	2010-01-23
\| *	git-svn: update svn mergeinfo test suite	Andrew Myrick	2010-01-23
* \|	t7800-difftool.sh: Test mergetool.prompt fallback	David Aguilar	2010-01-22
\|/
*	Merge branch 'maint'	Junio C Hamano	2010-01-22
\|\
\| *	ignore duplicated slashes in make_relative_path()	Junio C Hamano	2010-01-22
* \|	Merge branch 'jc/branch-d'	Junio C Hamano	2010-01-22
\|\ \
\| * \|	branch -d: base the "already-merged" safety on the branch it merges with	Junio C Hamano	2009-12-30
* \| \|	Merge branch 'il/rev-glob'	Junio C Hamano	2010-01-22
\|\ \ \
\| * \| \|	rev-parse --branches/--tags/--remotes=pattern	Ilari Liusvaara	2010-01-20
\| * \| \|	rev-parse --glob	Ilari Liusvaara	2010-01-20
* \| \| \|	Merge branch 'js/refer-upstream'	Junio C Hamano	2010-01-22
\|\ \ \ \
\| * \| \| \|	Teach @{upstream} syntax to strbuf_branchanme()	Junio C Hamano	2010-01-20
\| * \| \| \|	t1506: more test for @{upstream} syntax	Junio C Hamano	2010-01-20
\| * \| \| \|	Introduce <branch>@{upstream} notation	Johannes Schindelin	2010-01-12
* \| \| \| \|	Merge branch 'jl/submodule-diff'	Junio C Hamano	2010-01-22
\|\ \ \ \ \
\| * \| \| \| \|	git status: Show uncommitted submodule changes too when enabled	Jens Lehmann	2010-01-17
\| * \| \| \| \|	Teach diff that modified submodule directory is dirty	Junio C Hamano	2010-01-16
\| * \| \| \| \|	Show submodules as modified when they contain a dirty work tree	Jens Lehmann	2010-01-16
* \| \| \| \| \|	Merge branch 'il/remote-updates'	Junio C Hamano	2010-01-22
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Add git remote set-url	Ilari Liusvaara	2010-01-18
* \| \| \| \| \| \|	Merge branch 'il/branch-set-upstream'	Junio C Hamano	2010-01-22
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Add branch --set-upstream	Ilari Liusvaara	2010-01-18
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge branch 'jc/maint-limit-note-output'	Junio C Hamano	2010-01-22
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Fix "log --oneline" not to show notes	Junio C Hamano	2010-01-21
\| * \| \| \| \| \| \|	Fix "log" family not to be too agressive about showing notes	Junio C Hamano	2010-01-20
\| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'bg/maint-remote-update-default' into maint	Junio C Hamano	2010-01-20
\| \|\ \ \ \ \ \
\| * \ \ \ \ \ \	Merge branch 'sb/maint-octopus' into maint	Junio C Hamano	2010-01-20
\| \|\ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Merge branch 'maint-1.6.5' into maint	Junio C Hamano	2010-01-20
\| \|\ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \	Merge branch 'jk/maint-1.6.5-reset-hard' into maint-1.6.5	Junio C Hamano	2010-01-20
\| \| \|\ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \	Merge branch 'maint-1.6.4' into maint-1.6.5	Junio C Hamano	2010-01-18
\| \| \|\ \ \ \ \ \ \ \ \
\| \| \| * \ \ \ \ \ \ \ \	Merge branch 'maint-1.6.3' into maint-1.6.4	Junio C Hamano	2010-01-18
\| \| \| \|\ \ \ \ \ \ \ \ \
\| \| \| \| * \ \ \ \ \ \ \ \	Merge branch 'maint-1.6.2' into maint-1.6.3	Junio C Hamano	2010-01-18
\| \| \| \| \|\ \ \ \ \ \ \ \ \
\| \| \| \| \| * \ \ \ \ \ \ \ \	Merge branch 'maint-1.6.1' into maint-1.6.2	Junio C Hamano	2010-01-10
\| \| \| \| \| \|\ \ \ \ \ \ \ \ \
\| \| \| \| \| \| * \ \ \ \ \ \ \ \	Merge branch 'maint-1.6.0' into maint-1.6.1	Junio C Hamano	2010-01-10
\| \| \| \| \| \| \|\ \ \ \ \ \ \ \ \
\| \| \| * \| \| \| \ \ \ \ \ \ \ \ \	Merge commit 'v1.6.4.4-8-g8de6518' into maint-1.6.4	Junio C Hamano	2010-01-18
\| \| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \
\| \| \| \| * \| \| \| \| \| \| \| \| \| \| \| \|	Fix mis-backport of t7002	Junio C Hamano	2010-01-18
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	git-mv: fix moving more than one source to a single destination	Junio C Hamano	2010-01-22
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	rebase -i: Enclose sed command substitution in quotes	Michael Haggerty	2010-01-22
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make 'rerere forget' work from a subdirectory.	Johannes Sixt	2010-01-21
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make test case numbers unique	Johannes Sixt	2010-01-21
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	conflict-marker-size: add test and docs	Junio C Hamano	2010-01-20
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'ag/patch-header-verify'	Junio C Hamano	2010-01-20
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	builtin-apply.c: fix the --- and +++ header filename consistency check	Andreas Gruenbacher	2010-01-18
\| \|/ / / / / / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'ag/maint-apply-too-large-p'	Junio C Hamano	2010-01-20
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	builtin-apply.c: Skip filenames without enough components	Andreas Gruenbacher	2010-01-18
\| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'ap/merge-backend-opts'	Junio C Hamano	2010-01-20
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Extend merge-subtree tests to test -Xsubtree=dir.	Avery Pennarun	2010-01-17
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Teach git-pull to pass -X<option> to git-merge	Avery Pennarun	2010-01-17