summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'tr/test-lint-no-export-assignment-in-shell'Junio C Hamano2013-07-122-1/+2
|\
| * test-lint: detect 'export FOO=bar'Thomas Rast2013-07-081-0/+1
| * t9902: fix 'test A == B' to use = operatorThomas Rast2013-07-081-1/+1
* | Merge branch 'ml/cygwin-does-not-have-fifo'Junio C Hamano2013-07-121-1/+8
|\ \
| * | test-lib.sh - cygwin does not have usable FIFOsml/cygwin-does-not-have-fifoMark Levedahl2013-07-051-1/+8
| |/
| * Merge branch 'jc/t5551-posix-sed-bre' into maintJunio C Hamano2013-07-031-2/+6
| |\
| * \ Merge branch 'rs/empty-archive' into maintJunio C Hamano2013-07-032-0/+15
| |\ \
| * \ \ Merge branch 'ar/wildmatch-foldcase' into maintJunio C Hamano2013-07-031-6/+49
| |\ \ \
| * \ \ \ Merge branch 'cb/log-follow-with-combined' into maintJunio C Hamano2013-07-031-0/+14
| |\ \ \ \
| * \ \ \ \ Merge branch 'rr/die-on-missing-upstream' into maintJunio C Hamano2013-07-031-10/+5
| |\ \ \ \ \
* | \ \ \ \ \ Merge branch 'ms/remote-tracking-branches-in-doc'Junio C Hamano2013-07-121-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Change "remote tracking" to "remote-tracking"ms/remote-tracking-branches-in-docMichael Schubert2013-07-031-1/+1
| |/ / / / / /
* | | | | | | Merge branch 'as/log-output-encoding-in-user-format'Junio C Hamano2013-07-124-135/+257
|\ \ \ \ \ \ \
| * | | | | | | t4205 (log-pretty-formats): avoid using `sed`as/log-output-encoding-in-user-formatAlexey Shumkin2013-07-051-16/+10
| * | | | | | | t6006 (rev-list-format): add tests for "%b" and "%s" for the case i18n.commit...Alexey Shumkin2013-07-051-13/+28
| * | | | | | | t4205, t6006, t7102: make functions better readableAlexey Shumkin2013-07-053-25/+16
| * | | | | | | t4205 (log-pretty-formats): revert back single quotesAlexey Shumkin2013-07-051-53/+53
| * | | | | | | t4041, t4205, t6006, t7102: use iso8859-1 rather than iso-8859-1Alexey Shumkin2013-07-054-18/+18
| * | | | | | | t4205: replace .\+ with ..* in sed commandsBrian Gernhardt2013-07-011-2/+2
| * | | | | | | pretty: --format output should honor logOutputEncodingAlexey Shumkin2013-06-264-27/+27
| * | | | | | | pretty: Add failing tests: --format output should honor logOutputEncodingAlexey Shumkin2013-06-264-97/+199
| * | | | | | | t4205 (log-pretty-formats): don't hardcode SHA-1 in expected outputsAlexey Shumkin2013-06-261-22/+26
| * | | | | | | t7102 (reset): don't hardcode SHA-1 in expected outputsAlexey Shumkin2013-06-261-3/+5
| * | | | | | | t6006 (rev-list-format): don't hardcode SHA-1 in expected outputsAlexey Shumkin2013-06-261-63/+77
* | | | | | | | 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