summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'mt/send-email-cc-match-fix'Junio C Hamano2013-06-271-0/+14
|\
| * send-email: sanitize author when writing From lineMichael S. Tsirkin2013-06-201-1/+1
| * send-email: add test for duplicate utf8 nameMichael S. Tsirkin2013-06-201-0/+14
* | Merge branch 'jk/pull-into-dirty-unborn'Junio C Hamano2013-06-271-0/+29
|\ \
| * | pull: merge into unborn by fast-forwarding from empty treeThomas Rast2013-06-201-0/+29
* | | Merge branch 'bc/checkout-tracking-name-plug-leak'Junio C Hamano2013-06-271-2/+2
|\ \ \
| * | | t/t9802: explicitly name the upstream branch to use as a baseBrandon Casey2013-06-181-2/+2
* | | | Merge branch 'rr/rebase-stash-store'Junio C Hamano2013-06-271-0/+19
|\ \ \ \
| * | | | stash: introduce 'git stash store'Ramkumar Ramachandra2013-06-171-0/+19
* | | | | Merge branch 'tr/maint-apply-non-git-patch-parsefix'Junio C Hamano2013-06-261-0/+14
|\ \ \ \ \
| * | | | | apply: carefully strdup a possibly-NULL nameThomas Rast2013-06-211-0/+14
* | | | | | Merge branch 'vl/typofix'Junio C Hamano2013-06-261-1/+1
|\ \ \ \ \ \
| * | | | | | random typofixes (committed missing a 't', successful missing an 's')Veres Lajos2013-06-191-1/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'fg/submodule-non-ascii-path'Junio C Hamano2013-06-261-0/+15
|\ \ \ \ \ \
| * | | | | | t7400: test of UTF-8 submodule names pass under Mac OSTorsten Bögershausen2013-06-201-8/+11
| * | | | | | handle multibyte characters in nameFredrik Gustafsson2013-06-141-0/+12
* | | | | | | Merge branch 'rr/am-quit-empty-then-abort-fix'Junio C Hamano2013-06-241-17/+23
|\ \ \ \ \ \ \
| * | | | | | | t/am: use test_path_is_missing() where appropriateRamkumar Ramachandra2013-06-171-17/+17
| * | | | | | | am: handle stray $dotest directoryRamkumar Ramachandra2013-06-171-0/+6
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'rt/cherry-pick-continue-advice-in-status'Junio C Hamano2013-06-241-2/+4
|\ \ \ \ \ \ \
| * | | | | | | wt-status: give better advice when cherry-pick is in progressRalf Thielow2013-06-171-2/+4
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'dk/maint-t5150-dirname'Junio C Hamano2013-06-241-1/+1
|\ \ \ \ \ \ \
| * | | | | | | tests: allow sha1's as part of the pathDennis Kaarsemaker2013-06-171-1/+1
* | | | | | | | Merge branch 'rr/rebase-sha1-by-string-query'Junio C Hamano2013-06-242-0/+22
|\ \ \ \ \ \ \ \
| * | | | | | | | rebase: use peel_committish() where appropriateRamkumar Ramachandra2013-06-142-2/+2
| * | | | | | | | t/rebase: add failing tests for a peculiar revisionRamkumar Ramachandra2013-06-142-0/+22
* | | | | | | | | Merge branch 'mm/rm-coalesce-errors'Junio C Hamano2013-06-241-0/+96
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | rm: introduce advice.rmHints to shorten messagesMathieu Lienard--Mayor2013-06-121-0/+29
| * | | | | | | | | rm: better error message on failure for multiple filesMathieu Lienard--Mayor2013-06-121-0/+67
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Revert "Merge branch 'jg/status-config'"Junio C Hamano2013-06-241-57/+0
* | | | | | | | | Merge branch 'mz/rebase-tests'Junio C Hamano2013-06-238-203/+673
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | rebase topology tests: fix commit names on case-insensitive file systemsJohannes Sixt2013-06-182-18/+18
| * | | | | | | | | tests: move test for rebase messages from t3400 to t3406Martin von Zweigbergk2013-06-072-22/+22
| * | | | | | | | | t3406: modernize styleMartin von Zweigbergk2013-06-071-21/+9
| * | | | | | | | | add tests for rebasing merged historyMartin von Zweigbergk2013-06-075-137/+260
| * | | | | | | | | add tests for rebasing rootMartin von Zweigbergk2013-06-071-0/+129
| * | | | | | | | | add tests for rebasing of empty commitsMartin von Zweigbergk2013-06-072-24/+58
| * | | | | | | | | add tests for rebasing with patch-equivalence presentMartin von Zweigbergk2013-06-072-0/+102
| * | | | | | | | | add simple tests of consistency across rebase typesMartin von Zweigbergk2013-06-072-0/+94
| |/ / / / / / / /
* | | | | | | | | Merge branch 'jk/unpack-entry-fallback-to-another'Junio C Hamano2013-06-231-1/+28
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | unpack_entry: do not die when we fail to apply a deltaJeff King2013-06-141-0/+27
| * | | | | | | | | t5303: drop "count=1" from corruption ddJeff King2013-06-141-1/+1
* | | | | | | | | | Merge branch 'jk/apache-test-for-2.4'Junio C Hamano2013-06-231-1/+19
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | lib-httpd/apache.conf: check version only after mod_version loadsJeff King2013-06-211-3/+4
| * | | | | | | | | | t/lib-httpd/apache.conf: configure an MPM module for apache 2.4Jeff King2013-06-141-0/+3
| * | | | | | | | | | t/lib-httpd/apache.conf: load compat access module in apache 2.4Jeff King2013-06-141-0/+3
| * | | | | | | | | | t/lib-httpd/apache.conf: load extra auth modules in apache 2.4Jeff King2013-06-141-0/+9
| * | | | | | | | | | t/lib-httpd/apache.conf: do not use LockFile in apache >= 2.4Jeff King2013-06-141-0/+2
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'rr/rebase-autostash'Junio C Hamano2013-06-231-0/+22
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | rebase: finish_rebase() in noop rebaseRamkumar Ramachandra2013-06-131-0/+11