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

	Commit message (Expand)	Author	Age
*	Merge branch 'maint'	Junio C Hamano	2008-08-30
\|\
\| *	git-apply: Loosen "match_beginning" logic	Junio C Hamano	2008-08-30
\| *	Merge branch 'sp/missing-thin-base' into maint	Junio C Hamano	2008-08-30
\| \|\
\| \| *	pack-objects: Allow missing base objects when creating thin packs	Shawn O. Pearce	2008-08-12
\| * \|	Merge branch 'np/verify-pack' into maint	Junio C Hamano	2008-08-29
\| \|\ \
* \| \ \	Merge branch 'maint'	Junio C Hamano	2008-08-29
\|\ \ \ \ \| \|/ / /
\| * \| \|	pretty=format: respect date format options	Jeff King	2008-08-29
* \| \| \|	Merge branch 'mv/merge-custom'	Junio C Hamano	2008-08-27
\|\ \ \ \
\| * \| \| \|	t7606: fix custom merge test	Junio C Hamano	2008-08-23
\| * \| \| \|	Add a second testcase for handling invalid strategies in git-merge	Miklos Vajna	2008-07-29
\| * \| \| \|	Add a new test for using a custom merge strategy	Miklos Vajna	2008-07-29
* \| \| \| \|	Merge branch 'am/cherry-pick-rerere'	Junio C Hamano	2008-08-27
\|\ \ \ \ \
\| * \| \| \| \|	Make cherry-pick use rerere for conflict resolution.	Abhijit Menon-Sen	2008-08-11
* \| \| \| \| \|	Merge branch 'np/verify-pack'	Junio C Hamano	2008-08-27
\|\ \ \ \ \ \ \| \| \|_\|_\|/ / \| \|/\| \| \| \|
\| * \| \| \| \|	discard revindex data when pack list changes	Nicolas Pitre	2008-08-22
* \| \| \| \| \|	Merge branch 'maint'	Junio C Hamano	2008-08-26
\|\ \ \ \ \ \ \| \| \|_\|_\|/ / \| \|/\| \| \| \|
\| * \| \| \| \|	Suppress some bash redirection error messages	Ramsay Jones	2008-08-26
\| * \| \| \| \|	Fix "git log -i --grep"	Jeff King	2008-08-24
* \| \| \| \| \|	format-patch: use default diff format even with patch options	Jeff King	2008-08-26
* \| \| \| \| \|	Merge branch 'maint' to sync with 1.6.0.1	Junio C Hamano	2008-08-24
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Merge branch 'ag/maint-combine-diff-fix' into maint	Junio C Hamano	2008-08-24
\| \|\ \ \ \ \
\| \| * \| \| \| \|	Respect core.autocrlf in combined diff	Alexander Gavrilov	2008-08-23
\| \| \|/ / / /
\| * \| \| \| \|	merge: fix numerus bugs around "trivial merge" area	Junio C Hamano	2008-08-23
\| \|/ / / /
* \| \| \| \|	Extend "checkout --track" DWIM to support more cases	Alex Riesen	2008-08-22
* \| \| \| \|	filter-branch: Grok special characters in tag names	Johannes Sixt	2008-08-21
* \| \| \| \|	test-lib: do not remove trash_directory if called with --debug	Johannes Schindelin	2008-08-21
* \| \| \| \|	Merge branch 'jc/add-stop-at-symlink'	Junio C Hamano	2008-08-20
\|\ \ \ \ \
\| * \| \| \| \|	add: refuse to add working tree items beyond symlinks	Junio C Hamano	2008-08-04
\| * \| \| \| \|	update-index: refuse to add working tree items beyond symlinks	Junio C Hamano	2008-08-04
* \| \| \| \| \|	Merge branch 'kh/diff-tree'	Junio C Hamano	2008-08-20
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Add test for diff-tree --stdin with two trees	Karl Hasselström	2008-08-11
* \| \| \| \| \| \|	Merge branch 'mg/count-objects'	Junio C Hamano	2008-08-20
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	count-objects: Add total pack size to verbose output	Marcus Griep	2008-08-17
* \| \| \| \| \| \| \|	Merge branch 'cc/merge-base-many'	Junio C Hamano	2008-08-20
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	merge-base-many: add trivial tests based on the documentation	Junio C Hamano	2008-07-29
\| \| \|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'jc/test-deeper'	Junio C Hamano	2008-08-20
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	tests: use $TEST_DIRECTORY to refer to the t/ directory	Junio C Hamano	2008-08-17
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'js/parallel-test'	Junio C Hamano	2008-08-20
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Update t/.gitignore to ignore all trash directories	Marcus Griep	2008-08-18
\| * \| \| \| \| \| \| \|	Enable parallel tests	Johannes Schindelin	2008-08-08
\| * \| \| \| \| \| \| \|	tests: Clarify dependencies between tests, 'aggregate-results' and 'clean'	Johannes Schindelin	2008-08-08
\| * \| \| \| \| \| \| \|	t9700: remove useless check	Johannes Schindelin	2008-08-08
* \| \| \| \| \| \| \| \|	Merge branch 'maint'	Junio C Hamano	2008-08-20
\|\ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	"git-merge": allow fast-forwarding in a stat-dirty tree	Junio C Hamano	2008-08-20
\| * \| \| \| \| \| \| \|	for-each-ref: cope with tags with incomplete lines	Junio C Hamano	2008-08-20
\| * \| \| \| \| \| \| \|	diff --check: do not get confused by new blank lines in the middle	Junio C Hamano	2008-08-20
\| * \| \| \| \| \| \| \|	mailinfo: avoid violating strbuf assertion	Jeff King	2008-08-19
* \| \| \| \| \| \| \| \|	Merge branch 'dp/hash-literally'	Junio C Hamano	2008-08-19
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	add --no-filters option to git hash-object	Dmitry Potapov	2008-08-03
\| * \| \| \| \| \| \| \| \|	add --path option to git hash-object	Dmitry Potapov	2008-08-03