summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dl/octopus-graph-bug'Junio C Hamano2019-10-152-27/+308
|\
| * t4214: demonstrate octopus graph coloring failureDenton Liu2019-10-041-1/+281
| * t4214: explicitly list tags in logDenton Liu2019-10-041-4/+4
| * t4214: generate expect in their own test casesDenton Liu2019-10-041-21/+21
| * t4214: use test_mergeDenton Liu2019-10-041-2/+1
| * test-lib: let test_merge() perform octopus mergesDenton Liu2019-10-041-2/+4
* | Merge branch 'en/fast-imexport-nested-tags'Junio C Hamano2019-10-152-6/+99
|\ \
| * | fast-export: handle nested tagsElijah Newren2019-10-041-1/+1
| * | t9350: add tests for tags of things other than a commitElijah Newren2019-10-041-0/+31
| * | fast-export: allow user to request tags be marked with --mark-tagsElijah Newren2019-10-041-0/+14
| * | fast-export: add support for --import-marks-if-existsElijah Newren2019-10-041-6/+4
| * | fast-import: add support for new 'alias' commandElijah Newren2019-10-041-0/+5
| * | fast-import: allow tags to be identified by mark labelsElijah Newren2019-10-041-0/+19
| * | fast-import: fix handling of deleted tagsElijah Newren2019-10-041-0/+13
| * | fast-export: fix exporting a tag and nothing elseElijah Newren2019-09-281-0/+13
* | | Merge branch 'js/azure-pipelines-msvc'Junio C Hamano2019-10-152-16/+175
|\ \ \
| * | | tests: let --immediate and --write-junit-xml play well togetherJohannes Schindelin2019-10-061-16/+22
| * | | test-tool run-command: learn to run (parts of) the testsuiteJohannes Schindelin2019-10-061-0/+153
* | | | Merge branch 'js/fetch-jobs'Junio C Hamano2019-10-151-0/+11
|\ \ \ \
| * | | | fetch: let --jobs=<n> parallelize --multiple, tooJohannes Schindelin2019-10-061-0/+11
* | | | | Merge branch 'en/merge-recursive-cleanup'Junio C Hamano2019-10-153-4/+215
|\ \ \ \ \
| * | | | | merge-recursive: fix the diff3 common ancestor label for virtual commitsElijah Newren2019-10-021-0/+13
| * | | | | Ensure index matches head before invoking merge machinery, round NElijah Newren2019-08-191-1/+8
| * | | | | merge-recursive: provide a better label for diff3 common ancestorElijah Newren2019-08-192-3/+194
| | |_|_|/ | |/| | |
* | | | | Merge branch 'kt/add-i-progress'Junio C Hamano2019-10-111-1/+1
|\ \ \ \ \
| * | | | | add -i: show progress counter in the promptKunal Tyagi2019-10-041-1/+1
* | | | | | Merge branch 'js/stash-apply-in-secondary-worktree'Junio C Hamano2019-10-111-0/+27
|\ \ \ \ \ \
| * | | | | | stash apply: report status correctly even in a worktree's subdirectoryJohannes Schindelin2019-10-061-0/+27
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'js/range-diff-noprefix'Junio C Hamano2019-10-111-0/+4
|\ \ \ \ \ \
| * | | | | | range-diff: internally force `diff.noprefix=true`Johannes Schindelin2019-10-031-0/+4
| |/ / / / /
* | | | | | Merge branch 'ab/pcre-jit-fixes'Junio C Hamano2019-10-115-103/+194
|\ \ \ \ \ \
| * | | | | | grep: do not enter PCRE2_UTF mode on fixed matchingÆvar Arnfjörð Bjarmason2019-07-261-2/+2
| * | | | | | grep: stess test PCRE v2 on invalid UTF-8 dataÆvar Arnfjörð Bjarmason2019-07-261-0/+28
| * | | | | | grep: drop support for \0 in --fixed-strings <pattern>Ævar Arnfjörð Bjarmason2019-07-011-41/+41
| * | | | | | grep: make the behavior for NUL-byte in patterns saneÆvar Arnfjörð Bjarmason2019-07-011-73/+86
| * | | | | | grep tests: move binary pattern tests into their own fileÆvar Arnfjörð Bjarmason2019-07-012-101/+114
| * | | | | | grep tests: move "grep binary" alongside the restÆvar Arnfjörð Bjarmason2019-07-012-0/+0
| * | | | | | t4210: skip more command-line encoding tests on MinGWÆvar Arnfjörð Bjarmason2019-07-011-4/+4
| * | | | | | grep: don't use PCRE2?_UTF8 with "log --encoding=<non-utf8>"Ævar Arnfjörð Bjarmason2019-06-281-4/+2
| * | | | | | log tests: test regex backends in "--encode=<enc>" testsÆvar Arnfjörð Bjarmason2019-06-281-1/+40
* | | | | | | Merge branch 'pw/rebase-i-show-HEAD-to-reword'Junio C Hamano2019-10-114-12/+36
|\ \ \ \ \ \ \
| * | | | | | | rebase -i: check for updated todo after squash and rewordPhillip Wood2019-08-191-1/+20
| * | | | | | | rebase -i: always update HEAD before rewordingPhillip Wood2019-08-193-11/+16
* | | | | | | | Merge branch 'en/clean-nested-with-ignored'Junio C Hamano2019-10-112-5/+59
|\ \ \ \ \ \ \ \
| * | | | | | | | dir: special case check for the possibility that pathspec is NULLElijah Newren2019-10-021-0/+20
| * | | | | | | | clean: avoid removing untracked files in a nested git repositoryElijah Newren2019-09-171-5/+5
| * | | | | | | | clean: disambiguate the definition of -dElijah Newren2019-09-171-0/+2
| * | | | | | | | dir: if our pathspec might match files under a dir, recurse into itElijah Newren2019-09-171-2/+2
| * | | | | | | | dir: also check directories for matching pathspecsElijah Newren2019-09-171-2/+2
| * | | | | | | | t7300: add testcases showing failure to clean specified pathspecsElijah Newren2019-09-171-0/+32
View Lorry Controller Status