summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sb/cd-then-git-can-be-written-as-git-c'Junio C Hamano2017-01-231-4/+1
|\
| * lib-submodule-update.sh: reduce use of subshell by using "git -C"sb/cd-then-git-can-be-written-as-git-cStefan Beller2017-01-131-4/+1
* | Merge branch 'sg/fix-versioncmp-with-common-suffix'Junio C Hamano2017-01-231-20/+112
|\ \
| * | versioncmp: generalize version sort suffix reorderingsg/fix-versioncmp-with-common-suffixSZEDER Gábor2017-01-121-0/+35
| * | versioncmp: use earliest-longest contained suffix to determine sorting orderSZEDER Gábor2016-12-081-0/+31
| * | versioncmp: cope with common part overlapping with prerelease suffixSZEDER Gábor2016-12-081-2/+7
| * | t7004-tag: add version sort tests to show prerelease reordering issuesSZEDER Gábor2016-12-081-6/+30
| * | t7004-tag: use test_config helperSZEDER Gábor2016-12-081-13/+10
| * | t7004-tag: delete unnecessary tags with test_when_finishedSZEDER Gábor2016-12-081-1/+1
* | | Merge branch 'vn/diff-ihc-config'Junio C Hamano2017-01-231-1/+26
|\ \ \
| * | | diff: add interhunk context config optionvn/diff-ihc-configVegard Nossum2017-01-121-1/+26
| | |/ | |/|
* | | Merge branch 'sb/submodule-init'Junio C Hamano2017-01-231-0/+17
|\ \ \
| * | | submodule update --init: display correct path from submodulesb/submodule-initStefan Beller2017-01-121-0/+17
* | | | Merge branch 'sb/submodule-config-tests'Junio C Hamano2017-01-231-2/+23
|\ \ \ \
| * | | | t7411: test lookup of uninitialized submodulessb/submodule-config-testsStefan Beller2017-01-121-0/+21
| * | | | t7411: quote URLsStefan Beller2017-01-121-2/+2
| | |/ / | |/| |
* | | | Merge branch 'jk/grep-e-could-be-extended-beyond-posix'Junio C Hamano2017-01-231-11/+15
|\ \ \ \
| * | | | t7810: avoid assumption about invalid regex syntaxjk/grep-e-could-be-extended-beyond-posixJeff King2017-01-111-11/+15
* | | | | Merge branch 'rh/mergetool-regression-fix'Junio C Hamano2017-01-181-114/+165
|\ \ \ \ \
| * | | | | mergetool: fix running in subdir when rerere enabledrh/mergetool-regression-fixRichard Hansen2017-01-101-1/+6
| * | | | | t7610: add test case for rerere+mergetool+subdir bugRichard Hansen2017-01-101-1/+20
| * | | | | t7610: spell 'git reset --hard' consistentlyRichard Hansen2017-01-101-18/+19
| * | | | | t7610: don't assume the checked-out commitRichard Hansen2017-01-101-6/+6
| * | | | | t7610: always work on a test-specific branchRichard Hansen2017-01-101-2/+8
| * | | | | t7610: delete some now-unnecessary 'git reset --hard' linesRichard Hansen2017-01-101-2/+0
| * | | | | t7610: run 'git reset --hard' after each test to clean upRichard Hansen2017-01-101-0/+8
| * | | | | t7610: don't rely on state from previous testRichard Hansen2017-01-101-0/+6
| * | | | | t7610: use test_when_finished for cleanup tasksRichard Hansen2017-01-101-34/+37
| * | | | | t7610: move setup code to the 'setup' test caseRichard Hansen2017-01-101-30/+35
| * | | | | t7610: update branch names to match test numberRichard Hansen2017-01-101-41/+41
* | | | | | Merge branch 'sb/pathspec-errors'Junio C Hamano2017-01-181-0/+36
|\ \ \ \ \ \
| * | | | | | pathspec: give better message for submodule related pathspec errorsb/pathspec-errorsStefan Beller2017-01-091-0/+36
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'pb/test-must-fail-is-for-git'Junio C Hamano2017-01-1810-26/+26
|\ \ \ \ \ \
| * | | | | | t9813: avoid using pipespb/test-must-fail-is-for-gitPranit Bauva2017-01-091-4/+4
| * | | | | | don't use test_must_fail with grepPranit Bauva2017-01-0710-22/+22
| |/ / / / /
* | | | | | Merge branch 'js/mingw-test-push-unc-path'Junio C Hamano2017-01-181-0/+48
|\ \ \ \ \ \
| * | | | | | mingw: add a regression test for pushing to UNC pathsjs/mingw-test-push-unc-pathJohannes Schindelin2017-01-071-0/+48
* | | | | | | Merge branch 'km/branch-get-push-while-detached'Junio C Hamano2017-01-181-0/+6
|\ \ \ \ \ \ \
| * | | | | | | branch_get_push: do not segfault when HEAD is detachedkm/branch-get-push-while-detachedKyle Meyer2017-01-071-0/+6
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'jk/blame-fixes'Junio C Hamano2017-01-182-0/+149
|\ \ \ \ \ \ \
| * | | | | | | blame: output porcelain "previous" header for each filejk/blame-fixesJeff King2017-01-071-0/+117
| * | | | | | | blame: handle --no-abbrevJeff King2017-01-071-0/+4
| * | | | | | | blame: fix alignment with --abbrev=40Jeff King2017-01-071-0/+28
* | | | | | | | Merge branch 'jk/archive-zip-userdiff-config'Junio C Hamano2017-01-181-4/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | archive-zip: load userdiff configjk/archive-zip-userdiff-configJeff King2017-01-071-4/+18
| |/ / / / / / /
* | | | | | | | Merge branch 'dt/disable-bitmap-in-auto-gc'Junio C Hamano2017-01-182-5/+28
|\ \ \ \ \ \ \ \
| * | | | | | | | repack: die on incremental + write-bitmap-indexdt/disable-bitmap-in-auto-gcDavid Turner2016-12-291-5/+3
| * | | | | | | | auto gc: don't write bitmaps for incremental repacksDavid Turner2016-12-291-0/+25
| |/ / / / / / /
| * | | | | | | Merge branch 'nd/test-helpers' into maintJunio C Hamano2016-11-292-3/+18
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'as/merge-attr-sleep' into maintJunio C Hamano2016-11-291-5/+13
| |\ \ \ \ \ \ \ \
View Lorry Controller Status