summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/t1512-fix'Junio C Hamano2013-07-111-10/+22
|\
| * t1512: correct leftover constants from earlier editionJunio C Hamano2013-07-011-10/+22
* | Merge branch 'tr/test-v-and-v-subtest-only'Junio C Hamano2013-07-111-1/+2
|\ \
| * | t0000: do not use export X=Ytr/test-v-and-v-subtest-onlyTorsten Bögershausen2013-07-081-1/+2
* | | Merge branch 'af/rebase-i-merge-options'Junio C Hamano2013-07-111-0/+11
|\ \ \
| * | | Do not ignore merge options in interactive rebaseaf/rebase-i-merge-optionsArnaud Fontaine2013-07-021-0/+11
* | | | Merge branch 'pb/stash-refuse-to-kill'Junio C Hamano2013-07-112-3/+38
|\ \ \ \
| * | | | git stash: avoid data loss when "git stash save" kills a directoryPetr Baudis2013-07-011-0/+18
| * | | | treat_directory(): do not declare submodules to be untrackedJunio C Hamano2013-07-011-3/+20
* | | | | Merge branch 'jc/maint-diff-core-safecrlf'Junio C Hamano2013-07-111-0/+8
|\ \ \ \ \
| * | | | | diff: demote core.safecrlf=true to core.safecrlf=warnJunio C Hamano2013-06-251-0/+8
* | | | | | Merge branch 'jg/status-config'Junio C Hamano2013-07-111-0/+62
|\ \ \ \ \ \
| * | | | | | status/commit: make sure --porcelain is not affected by user-facing configJunio C Hamano2013-06-241-0/+5
| * | | | | | status: introduce status.branch to enable --branch by defaultJorge Juan Garcia Garcia2013-06-241-0/+27
| * | | | | | status: introduce status.short to enable --short by defaultJorge Juan Garcia Garcia2013-06-241-0/+30
* | | | | | | Merge branch 'jk/bash-completion'Junio C Hamano2013-07-111-0/+1
|\ \ \ \ \ \ \
| * | | | | | | completion: learn about --man-pathJohn Keeping2013-06-301-0/+1
* | | | | | | | Merge branch 'rr/rebase-checkout-reflog'Junio C Hamano2013-07-112-21/+60
|\ \ \ \ \ \ \ \
| * | | | | | | | checkout: respect GIT_REFLOG_ACTIONRamkumar Ramachandra2013-06-171-4/+4
| * | | | | | | | status: do not depend on rebase reflog messagesRamkumar Ramachandra2013-06-171-20/+17
| * | | | | | | | t/t2021-checkout-last: "checkout -" should work after a rebase finishesRamkumar Ramachandra2013-06-171-0/+34
| * | | | | | | | t7512: test "detached from" as wellJunio C Hamano2013-06-171-1/+9
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'jc/triangle-push-fixup'Junio C Hamano2013-07-111-4/+61
|\ \ \ \ \ \ \ \
| * | | | | | | | t/t5528-push-default: test pushdefault workflowsRamkumar Ramachandra2013-06-241-0/+57
| * | | | | | | | t/t5528-push-default: generalize test_push_*Ramkumar Ramachandra2013-06-241-2/+4
| * | | | | | | | t/t5528-push-default: remove redundant test_config linesRamkumar Ramachandra2013-06-191-2/+0
* | | | | | | | | Merge branch 'tr/test-v-and-v-subtest-only'Junio C Hamano2013-07-056-53/+276
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | perf-lib: fix start/stop of perf testsThomas Gummerer2013-06-291-1/+2
| * | | | | | | | test-lib: support running tests under valgrind in parallelThomas Rast2013-06-231-22/+84
| * | | | | | | | test-lib: allow prefixing a custom string before "ok N" etc.Thomas Rast2013-06-231-12/+15
| * | | | | | | | test-lib: valgrind for only tests matching a patternThomas Rast2013-06-233-1/+43
| * | | | | | | | test-lib: verbose mode for only tests matching a patternThomas Rast2013-06-233-0/+60
| * | | | | | | | test-lib: self-test that --verbose worksThomas Rast2013-06-232-1/+38
| * | | | | | | | test-lib: rearrange start/end of test_expect_* and test_skipThomas Rast2013-06-182-3/+12
| * | | | | | | | test-lib: refactor $GIT_SKIP_TESTS matchingThomas Rast2013-06-181-17/+24
| * | | | | | | | test-lib: enable MALLOC_* for the actual testsThomas Rast2013-06-171-0/+2
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'maint'Junio C Hamano2013-07-012-3/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | t7500: fix flipped actual/expectAndrew Pimlott2013-07-011-3/+3
| * | | | | | | | lib-rebase: document exec_ in FAKE_LINESAndrew Pimlott2013-07-011-0/+2
* | | | | | | | | Merge branch 'rr/remote-branch-config-refresh'Junio C Hamano2013-07-011-377/+471
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t/t5505-remote: test multiple push/pull in remotes-fileRamkumar Ramachandra2013-06-231-2/+14
| * | | | | | | | | t/t5505-remote: test url-with-# in branches-fileRamkumar Ramachandra2013-06-231-4/+18
| * | | | | | | | | t/t5505-remote: use test_path_is_missingRamkumar Ramachandra2013-06-231-2/+2
| * | | | | | | | | t/t5505-remote: test push-refspec in branches-fileRamkumar Ramachandra2013-06-231-1/+2
| * | | | | | | | | t/t5505-remote: modernize styleRamkumar Ramachandra2013-06-231-373/+440
* | | | | | | | | | Merge branch 'ed/color-prompt'Junio C Hamano2013-07-011-0/+141
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git-prompt.sh: do not print duplicate clean color codeEduardo R. D'Avila2013-06-261-4/+4
| * | | | | | | | | | t9903: remove redundant testsEduardo R. D'Avila2013-06-261-114/+1
| * | | | | | | | | | t9903: add tests for git-prompt pcmodeEduardo R. D'Avila2013-06-261-0/+254
* | | | | | | | | | | Merge branch 'ap/rebase-multiple-fixups'Junio C Hamano2013-07-012-38/+107
|\ \ \ \ \ \ \ \ \ \ \