delta/git.git - github.com: git/git.git

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'vl/typofix'	Junio C Hamano	2013-06-26	1	-1/+1
\|\
\| *	random typofixes (committed missing a 't', successful missing an 's')	Veres Lajos	2013-06-19	1	-1/+1
* \|	Merge branch 'fg/submodule-non-ascii-path'	Junio C Hamano	2013-06-26	1	-0/+15
\|\ \
\| * \|	t7400: test of UTF-8 submodule names pass under Mac OS	Torsten Bögershausen	2013-06-20	1	-8/+11
\| * \|	handle multibyte characters in name	Fredrik Gustafsson	2013-06-14	1	-0/+12
* \| \|	Merge branch 'rr/am-quit-empty-then-abort-fix'	Junio C Hamano	2013-06-24	1	-17/+23
\|\ \ \
\| * \| \|	t/am: use test_path_is_missing() where appropriate	Ramkumar Ramachandra	2013-06-17	1	-17/+17
\| * \| \|	am: handle stray $dotest directory	Ramkumar Ramachandra	2013-06-17	1	-0/+6
* \| \| \|	Merge branch 'rt/cherry-pick-continue-advice-in-status'	Junio C Hamano	2013-06-24	1	-2/+4
\|\ \ \ \
\| * \| \| \|	wt-status: give better advice when cherry-pick is in progress	Ralf Thielow	2013-06-17	1	-2/+4
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge branch 'dk/maint-t5150-dirname'	Junio C Hamano	2013-06-24	1	-1/+1
\|\ \ \ \
\| * \| \| \|	tests: allow sha1's as part of the path	Dennis Kaarsemaker	2013-06-17	1	-1/+1
* \| \| \| \|	Merge branch 'rr/rebase-sha1-by-string-query'	Junio C Hamano	2013-06-24	2	-0/+22
\|\ \ \ \ \
\| * \| \| \| \|	rebase: use peel_committish() where appropriate	Ramkumar Ramachandra	2013-06-14	2	-2/+2
\| * \| \| \| \|	t/rebase: add failing tests for a peculiar revision	Ramkumar Ramachandra	2013-06-14	2	-0/+22
* \| \| \| \| \|	Merge branch 'mm/rm-coalesce-errors'	Junio C Hamano	2013-06-24	1	-0/+96
\|\ \ \ \ \ \
\| * \| \| \| \| \|	rm: introduce advice.rmHints to shorten messages	Mathieu Lienard--Mayor	2013-06-12	1	-0/+29
\| * \| \| \| \| \|	rm: better error message on failure for multiple files	Mathieu Lienard--Mayor	2013-06-12	1	-0/+67
\| \| \|_\|/ / / \| \|/\| \| \| \|
* \| \| \| \| \|	Revert "Merge branch 'jg/status-config'"	Junio C Hamano	2013-06-24	1	-57/+0
* \| \| \| \| \|	Merge branch 'mz/rebase-tests'	Junio C Hamano	2013-06-23	8	-203/+673
\|\ \ \ \ \ \
\| * \| \| \| \| \|	rebase topology tests: fix commit names on case-insensitive file systems	Johannes Sixt	2013-06-18	2	-18/+18
\| * \| \| \| \| \|	tests: move test for rebase messages from t3400 to t3406	Martin von Zweigbergk	2013-06-07	2	-22/+22
\| * \| \| \| \| \|	t3406: modernize style	Martin von Zweigbergk	2013-06-07	1	-21/+9
\| * \| \| \| \| \|	add tests for rebasing merged history	Martin von Zweigbergk	2013-06-07	5	-137/+260
\| * \| \| \| \| \|	add tests for rebasing root	Martin von Zweigbergk	2013-06-07	1	-0/+129
\| * \| \| \| \| \|	add tests for rebasing of empty commits	Martin von Zweigbergk	2013-06-07	2	-24/+58
\| * \| \| \| \| \|	add tests for rebasing with patch-equivalence present	Martin von Zweigbergk	2013-06-07	2	-0/+102
\| * \| \| \| \| \|	add simple tests of consistency across rebase types	Martin von Zweigbergk	2013-06-07	2	-0/+94
\| \|/ / / / /
* \| \| \| \| \|	Merge branch 'jk/unpack-entry-fallback-to-another'	Junio C Hamano	2013-06-23	1	-1/+28
\|\ \ \ \ \ \
\| * \| \| \| \| \|	unpack_entry: do not die when we fail to apply a delta	Jeff King	2013-06-14	1	-0/+27
\| * \| \| \| \| \|	t5303: drop "count=1" from corruption dd	Jeff King	2013-06-14	1	-1/+1
* \| \| \| \| \| \|	Merge branch 'jk/apache-test-for-2.4'	Junio C Hamano	2013-06-23	1	-1/+19
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	lib-httpd/apache.conf: check version only after mod_version loads	Jeff King	2013-06-21	1	-3/+4
\| * \| \| \| \| \| \|	t/lib-httpd/apache.conf: configure an MPM module for apache 2.4	Jeff King	2013-06-14	1	-0/+3
\| * \| \| \| \| \| \|	t/lib-httpd/apache.conf: load compat access module in apache 2.4	Jeff King	2013-06-14	1	-0/+3
\| * \| \| \| \| \| \|	t/lib-httpd/apache.conf: load extra auth modules in apache 2.4	Jeff King	2013-06-14	1	-0/+9
\| * \| \| \| \| \| \|	t/lib-httpd/apache.conf: do not use LockFile in apache >= 2.4	Jeff King	2013-06-14	1	-0/+2
\| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'rr/rebase-autostash'	Junio C Hamano	2013-06-23	1	-0/+22
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	rebase: finish_rebase() in noop rebase	Ramkumar Ramachandra	2013-06-13	1	-0/+11
\| * \| \| \| \| \| \|	rebase: finish_rebase() in fast-forward rebase	Ramkumar Ramachandra	2013-06-13	1	-0/+11
\| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'jg/status-config'	Junio C Hamano	2013-06-23	1	-0/+57
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	status: introduce status.branch to enable --branch by default	Jorge Juan Garcia Garcia	2013-06-15	1	-0/+27
\| * \| \| \| \| \| \|	status: introduce status.short to enable --short by default	Jorge Juan Garcia Garcia	2013-06-11	1	-0/+30
\| \| \|_\|_\|/ / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	transport-helper: be quiet on read errors from helpers	Jeff King	2013-06-21	1	-3/+1
* \| \| \| \| \| \|	Merge branch 'rs/discard-index-discard-array'	Junio C Hamano	2013-06-20	1	-0/+14
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	read-cache: add simple performance test	René Scharfe	2013-06-09	1	-0/+14
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge branch 'fc/show-non-empty-errors-in-test'	Junio C Hamano	2013-06-20	9	-53/+65
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	test: test_must_be_empty helper	Junio C Hamano	2013-06-09	9	-53/+65
* \| \| \| \| \| \| \|	Merge branch 'js/test-ln-s-add'	Junio C Hamano	2013-06-20	29	-329/+347
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	t4011: remove SYMLINKS prerequisite	Johannes Sixt	2013-06-07	1	-10/+25