summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* stash: Don't fail if work dir contains file named 'HEAD'jm/stash-diff-disambiguateJonathon Mah2012-01-013-28/+76
* Merge branch 'rr/revert-cherry-pick'Junio C Hamano2011-12-222-26/+65
|\
| * t3502, t3510: clarify cherry-pick -m failurerr/revert-cherry-pickRamkumar Ramachandra2011-12-152-2/+2
| * t3510 (cherry-pick-sequencer): use exit statusRamkumar Ramachandra2011-12-151-29/+29
| * revert: tolerate extra spaces, tabs in insn sheetRamkumar Ramachandra2011-12-151-0/+11
| * revert: make commit subjects in insn sheet optionalRamkumar Ramachandra2011-12-151-0/+28
* | Merge branch 'tr/pty-all'Junio C Hamano2011-12-221-0/+4
|\ \
| * | test-terminal: set output terminals to raw modetr/pty-allThomas Rast2011-12-191-0/+4
* | | Merge branch 'tr/grep-threading'Junio C Hamano2011-12-221-0/+14
|\ \ \
| * | | grep: load funcname patterns for -WThomas Rast2011-12-121-0/+14
* | | | Merge branch 'jk/pretty-reglog-ent'Junio C Hamano2011-12-221-0/+6
|\ \ \ \
| * | | | pretty: give placeholders to reflog identityjk/pretty-reglog-entJeff King2011-12-161-0/+6
* | | | | Merge branch 'nd/war-on-nul-in-commit'Junio C Hamano2011-12-221-0/+6
|\ \ \ \ \
| * | | | | commit_tree(): refuse commit messages that contain NULsnd/war-on-nul-in-commitNguyễn Thái Ngọc Duy2011-12-151-0/+6
| |/ / / /
* | | | | Merge branch 'jk/maint-do-not-feed-stdin-to-tests'Junio C Hamano2011-12-221-1/+2
|\ \ \ \ \
| * | | | | test-lib: redirect stdin of testsjk/maint-do-not-feed-stdin-to-testsJeff King2011-12-151-1/+2
* | | | | | Merge branch 'jn/test-cleanup-7006'Junio C Hamano2011-12-221-56/+17
|\ \ \ \ \ \
| * | | | | | test: errors preparing for a test are not specialjn/test-cleanup-7006Jonathan Nieder2011-12-141-56/+17
* | | | | | | Merge branch 'jk/http-push-to-empty'Junio C Hamano2011-12-221-0/+32
|\ \ \ \ \ \ \
| * | | | | | | remote-curl: don't pass back fake refsjk/http-push-to-emptyJeff King2011-12-191-0/+32
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'jc/request-pull-show-head-4'Junio C Hamano2011-12-201-0/+3
|\ \ \ \ \ \ \
| * | | | | | | request-pull: do not emit "tag" before the tagnameJunio C Hamano2011-12-191-1/+1
| * | | | | | | request-pull: update the "pull" command generation logicJunio C Hamano2011-12-161-0/+3
* | | | | | | | Merge branch 'jc/checkout-m-twoway'Junio C Hamano2011-12-201-1/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | t/t2023-checkout-m.sh: fix use of test_must_failjc/checkout-m-twowayÆvar Arnfjörð Bjarmason2011-12-201-1/+3
* | | | | | | | | Merge branch 'tr/cache-tree'Junio C Hamano2011-12-201-4/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t0090: be prepared that 'wc -l' writes leading blankstr/cache-treeJohannes Sixt2011-12-201-4/+2
* | | | | | | | | | Merge branch 'ab/enable-i18n'Junio C Hamano2011-12-1912-2/+512
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | i18n: add infrastructure for translating Git with gettextab/enable-i18nÆvar Arnfjörð Bjarmason2011-12-0512-2/+512
* | | | | | | | | | | Merge branch 'jc/checkout-m-twoway'Junio C Hamano2011-12-191-0/+47
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Test 'checkout -m -- path'Pete Harlan2011-12-111-0/+47
* | | | | | | | | | | Merge branch 'jk/maint-push-over-dav'Junio C Hamano2011-12-192-0/+37
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | http-push: enable "proactive auth"jk/maint-push-over-davJeff King2011-12-131-1/+1
| * | | | | | | | | | | t5540: test DAV push with authenticationJeff King2011-12-132-0/+37
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'jk/fetch-no-tail-match-refs'Junio C Hamano2011-12-192-3/+32
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | fetch-pack: match refs exactlyJeff King2011-12-131-0/+29
| * | | | | | | | | | | t5500: give fully-qualified refs to fetch-packJeff King2011-12-131-3/+3
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'jn/maint-sequencer-fixes'Junio C Hamano2011-12-192-58/+156
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | Revert "reset: Make reset remove the sequencer state"Jonathan Nieder2011-12-122-53/+1
| * | | | | | | | | | revert: do not remove state until sequence is finishedJonathan Nieder2011-12-121-3/+3
| * | | | | | | | | | revert: allow single-pick in the middle of cherry-pick sequenceJonathan Nieder2011-12-121-0/+12
| * | | | | | | | | | revert: pass around rev-list args in already-parsed formJonathan Nieder2011-12-121-0/+5
| * | | | | | | | | | revert: allow cherry-pick --continue to commit before resumingJonathan Nieder2011-12-121-3/+136
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'rr/test-chaining'Junio C Hamano2011-12-1915-199/+123
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t3401: use test_commit in setuprr/test-chainingMartin von Zweigbergk2011-12-111-25/+10
| * | | | | | | | | | t3401: modernize styleMartin von Zweigbergk2011-12-111-34/+33
| * | | | | | | | | | t3040 (subprojects-basic): fix '&&' chaining, modernize styleRamkumar Ramachandra2011-12-091-72/+72
| * | | | | | | | | | t1510 (worktree): fix '&&' chainingRamkumar Ramachandra2011-12-091-3/+3
| * | | | | | | | | | t3030 (merge-recursive): use test_expect_codeRamkumar Ramachandra2011-12-091-66/+6
| * | | | | | | | | | test: fix '&&' chainingRamkumar Ramachandra2011-12-0810-17/+17