summaryrefslogtreecommitdiffstats
path: root/t (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ds/sha256-leftover-bits'Junio C Hamano2020-08-206-11/+96
|\
| * multi-pack-index: use hash version byteDerrick Stolee2020-08-182-6/+45
| * commit-graph: use the "hash version" byteDerrick Stolee2020-08-183-5/+47
| * t/README: document GIT_TEST_DEFAULT_HASHDerrick Stolee2020-08-181-0/+4
* | Merge branch 'jc/object-names-are-not-sha-1'Junio C Hamano2020-08-201-1/+1
|\ \
| * | messages: avoid SHA-1 in end-user facing messagesJunio C Hamano2020-08-141-1/+1
* | | Merge branch 'pb/userdiff-fortran-update'Junio C Hamano2020-08-2010-0/+95
|\ \ \
| * | | userdiff: improve Fortran xfuncname regexPhilippe Blain2020-08-131-1/+0
| * | | userdiff: add tests for Fortran xfuncname regexPhilippe Blain2020-08-1310-0/+96
| |/ /
* | | Merge branch 'jk/blame-coalesce-fix'Junio C Hamano2020-08-201-9/+19
|\ \ \
| * | | blame: only coalesce lines that are adjacent in resultJeff King2020-08-131-0/+9
| * | | t8003: factor setup out of coalesce testJeff King2020-08-131-6/+10
| * | | t8003: check output of coalesced blameJeff King2020-08-131-7/+4
| |/ /
* | | Merge branch 'ak/sequencer-fix-find-uniq-abbrev'Junio C Hamano2020-08-201-0/+6
|\ \ \
| * | | rebase -i: fix possibly wrong onto hash in todoAntti Keränen2020-08-131-0/+6
| |/ /
* | | Merge branch 'en/sequencer-merge-labels'Junio C Hamano2020-08-202-11/+11
|\ \ \
| * | | sequencer: avoid garbled merge machinery messages due to commit labelsElijah Newren2020-08-142-11/+11
| |/ /
* | | Merge branch 'en/merge-tests'Junio C Hamano2020-08-2035-48/+71
|\ \ \
| * | | t6425: be more flexible with rename/delete conflict messagesElijah Newren2020-08-111-1/+2
| * | | t642[23]: be more flexible for add/add conflicts involving pair renamesElijah Newren2020-08-112-8/+14
| * | | t6422, t6426: be more flexible for add/add conflicts involving renamesElijah Newren2020-08-112-9/+14
| * | | t6423: add an explanation about why one of the tests does not passElijah Newren2020-08-111-0/+8
| * | | t6416, t6423: clarify some comments and fix some typosElijah Newren2020-08-112-14/+13
| * | | t6422: fix multiple errors with the mod6 test expectationsElijah Newren2020-08-111-9/+10
| * | | t6423: fix test setup for a couple testsElijah Newren2020-08-111-0/+2
| * | | t6416, t6422: fix incorrect untracked file countElijah Newren2020-08-112-3/+3
| * | | t6422: fix bad check against missing fileElijah Newren2020-08-111-3/+3
| * | | t6418: tighten delete/normalize conflict testcaseElijah Newren2020-08-111-1/+2
| * | | Collect merge-related tests to t64xxElijah Newren2020-08-1135-0/+0
* | | | Merge branch 'so/log-diff-merges-opt'Junio C Hamano2020-08-183-0/+158
|\ \ \ \
| * | | | t/t4013: add test for --diff-merges=offSergey Organov2020-08-113-0/+158
* | | | | Merge branch 'jk/log-fp-implies-m'Junio C Hamano2020-08-183-0/+101
|\| | | |
| * | | | log: enable "-m" automatically with "--first-parent"Jeff King2020-07-291-0/+22
| * | | | revision: add "--no-diff-merges" option to counteract "-m"Jeff King2020-07-292-0/+79
| | |/ / | |/| |
* | | | Merge branch 'es/test-cmp-typocatcher'Junio C Hamano2020-08-181-2/+14
|\ \ \ \
| * | | | test_cmp: diagnose incorrect argumentsEric Sunshine2020-08-091-2/+14
| |/ / /
* | | | Merge branch 'rp/apply-cached-with-i-t-a'Junio C Hamano2020-08-181-0/+56
|\ \ \ \
| * | | | t4140: test apply with i-t-a pathsRaymond E. Pasco2020-08-091-0/+56
* | | | | Merge branch 'al/bisect-first-parent'Junio C Hamano2020-08-183-50/+103
|\ \ \ \ \
| * | | | | bisect: introduce first-parent flagAaron Lipman2020-08-081-0/+18
| * | | | | rev-list: allow bisect and first-parent flagsAaron Lipman2020-08-082-2/+47
| * | | | | t6030: modernize "git bisect run" testsAaron Lipman2020-08-081-48/+38
| | |/ / / | |/| | |
* | | | | Merge branch 'hn/reftable-prep-part-2'Junio C Hamano2020-08-182-16/+19
|\ \ \ \ \
| * | | | | Modify pseudo refs through ref backend storageHan-Wen Nienhuys2020-07-272-6/+9
| * | | | | t1400: use git rev-parse for testing PSEUDOREF existenceHan-Wen Nienhuys2020-07-161-10/+10
* | | | | | Merge branch 'dd/send-email-config'Junio C Hamano2020-08-181-0/+29
|\ \ \ \ \ \
| * | | | | | git-send-email: die if sendmail.* config is setDrew DeVault2020-07-241-0/+29
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'ps/ref-transaction-hook'Junio C Hamano2020-08-181-0/+27
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | t1416: avoid hard-coded sha1 idsJeff King2020-08-111-2/+3
| * | | | | refs: fix interleaving hook calls with reference-transaction hookPatrick Steinhardt2020-08-071-0/+26