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

	Commit message (Expand)	Author	Age
*	Merge branch 'maint'	Junio C Hamano	2008-07-16
\|\
\| *	Merge branch 'ls/maint-mailinfo-patch-label' into maint	Junio C Hamano	2008-07-16
\| \|\
\| * \|	t7600-merge: Use test_expect_failure to test option parsing	Johannes Sixt	2008-07-16
* \| \|	t/Makefile: use specified shell when running aggregation script	SungHyun Nam	2008-07-16
* \| \|	t/aggregate-results: whitespace fix	Junio C Hamano	2008-07-16
* \| \|	t/lib-git-svn: fix SVN_HTTPD tests to work with "trash directory"	Eric Wong	2008-07-16
* \| \|	Merge branch 'mv/merge-in-c'	Junio C Hamano	2008-07-15
\|\ \ \
\| * \| \|	reduce_heads(): protect from duplicate input	Junio C Hamano	2008-07-14
\| * \| \|	reduce_heads(): thinkofix	Sverre Hvammen Johansen	2008-07-13
\| * \| \|	Add a new test for git-merge-resolve	Miklos Vajna	2008-07-13
\| * \| \|	t6021: add a new test for git-merge-resolve	Miklos Vajna	2008-07-13
\| * \| \|	Teach merge.log to "git-merge" again	Junio C Hamano	2008-07-10
\| * \| \|	Build in merge	Miklos Vajna	2008-07-07
\| * \| \|	Fix t7601-merge-pull-config.sh on AIX	Miklos Vajna	2008-07-06
\| * \| \|	Add new test case to ensure git-merge prepends the custom merge message	Miklos Vajna	2008-07-06
\| * \| \|	Add new test case to ensure git-merge reduces octopus parents when possible	Miklos Vajna	2008-06-30
\| * \| \|	Add new test to ensure git-merge handles more than 25 refs.	Miklos Vajna	2008-06-30
\| * \| \|	Add new test to ensure git-merge handles pull.twohead and pull.octopus	Miklos Vajna	2008-06-30
* \| \| \|	Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge"	Johannes Schindelin	2008-07-15
* \| \| \|	t9600: allow testing with cvsps 2.2, including beta versions	Pavel Roskin	2008-07-15
* \| \| \|	Merge branch 'js/merge-rr'	Junio C Hamano	2008-07-14
\|\ \ \ \
\| * \| \| \|	Move MERGE_RR from .git/rr-cache/ into .git/	Johannes Schindelin	2008-07-13
* \| \| \| \|	Merge branch 'ls/maint-mailinfo-patch-label'	Junio C Hamano	2008-07-14
\|\ \ \ \ \ \| \| \|_\|_\|/ \| \|/\| \| \|
\| * \| \| \|	git-mailinfo: Fix getting the subject from the in-body [PATCH] line	Lukas Sandström	2008-07-13
* \| \| \| \|	Merge branch 'om/rerere-careful'	Junio C Hamano	2008-07-14
\|\ \ \ \ \ \| \| \|/ / / \| \|/\| \| \|
\| * \| \| \|	builtin-rerere: more carefully find conflict markers	Olivier Marin	2008-07-10
* \| \| \| \|	restore legacy behavior for read_sha1_file()	Nicolas Pitre	2008-07-14
* \| \| \| \|	git-submodule - make "submodule add" more strict, and document it	Mark Levedahl	2008-07-14
* \| \| \| \|	git-svn: find-rev and rebase for SVN::Mirror repositories	João Abecasis	2008-07-14
* \| \| \| \|	t3404: test two "preserve merges with -p" cases	Stephan Beyer	2008-07-13
* \| \| \| \|	Merge branch 'maint' to sync with 1.5.6.3	Junio C Hamano	2008-07-13
\|\ \ \ \ \ \| \| \|_\|_\|/ \| \|/\| \| \|
\| * \| \| \|	t0004: fix timing bug	Junio C Hamano	2008-07-12
\| \| \|/ / \| \|/\| \|
\| * \| \|	Fix backwards-incompatible handling of core.sharedRepository	Petr Baudis	2008-07-11
* \| \| \|	Merge branch 'am/stash-branch'	Junio C Hamano	2008-07-13
\|\ \ \ \
\| * \| \| \|	Add a test for "git stash branch"	Abhijit Menon-Sen	2008-07-06
* \| \| \| \|	Merge branch 'jc/report-tracking'	Junio C Hamano	2008-07-13
\|\ \ \ \ \
\| * \| \| \| \|	stat_tracking_info(): clear object flags used during counting	Junio C Hamano	2008-07-03
\| \|/ / / /
* \| \| \| \|	Merge branch 'js/pick-root'	Junio C Hamano	2008-07-13
\|\ \ \ \ \
\| * \| \| \| \|	Allow cherry-picking root commits	Johannes Schindelin	2008-07-07
* \| \| \| \| \|	Merge branch 'tr/add-i-e'	Junio C Hamano	2008-07-13
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \|
\| * \| \| \| \|	git-add--interactive: manual hunk editing mode	Thomas Rast	2008-07-02
* \| \| \| \| \|	apply: fix copy/rename breakage	Junio C Hamano	2008-07-09
* \| \| \| \| \|	Merge branch 'js/apply-root'	Junio C Hamano	2008-07-09
\|\ \ \ \ \ \
\| * \| \| \| \| \|	git-apply --directory: make --root more similar to GNU diff	Junio C Hamano	2008-07-06
\| * \| \| \| \| \|	apply --root: thinkofix.	Junio C Hamano	2008-07-02
\| * \| \| \| \| \|	Teach "git apply" to prepend a prefix with "--root=<root>"	Johannes Schindelin	2008-07-01
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
* \| \| \| \| \|	t9100-git-svn-basic.sh: Fix determination of utf-8 locale	Ramsay Jones	2008-07-09
* \| \| \| \| \|	t9113-*.sh: provide user feedback when test skipped	Ramsay Jones	2008-07-09
* \| \| \| \| \|	Merge branch 'maint'	Junio C Hamano	2008-07-09
\|\ \ \ \ \ \ \| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
\| * \| \| \| \|	Remove unnecessary pack-*.keep file after successful git-clone	Shawn O. Pearce	2008-07-08