summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'en/keep-cwd'Junio C Hamano2022-01-261-0/+21
|\
| * sequencer, stash: fix running from worktree subdirElijah Newren2022-01-261-0/+21
* | Merge branch 'ab/checkout-branch-info-leakfix'Junio C Hamano2022-01-241-0/+13
|\ \
| * | checkout: avoid BUG() when hitting a broken repositoryJunio C Hamano2022-01-211-0/+13
* | | Merge branch 'js/t1450-making-it-writable-does-not-need-full-posixperm'Junio C Hamano2022-01-141-2/+2
|\ \ \
| * | | t1450-fsck: exec-bit is not needed to make loose object writableJohannes Sixt2022-01-131-2/+2
* | | | Merge branch 'fs/gpg-unknown-key-test-fix'Junio C Hamano2022-01-121-20/+2
|\ \ \ \
| * | | | t/gpg: simplify test for unknown keyFabian Stelzer2022-01-121-20/+2
* | | | | Merge branch 'ma/windows-dynload-fix'Junio C Hamano2022-01-121-1/+3
|\ \ \ \ \
| * | | | | lazyload: use correct calling conventionsMatthias Aßhauer2022-01-091-1/+3
| | |/ / / | |/| | |
* | | | | Merge branch 'fs/ssh-signing-key-lifetime'Junio C Hamano2022-01-121-0/+8
|\ \ \ \ \
| * | | | | fmt-merge-msg: prevent use-after-free with signed tagsTaylor Blau2022-01-101-0/+8
* | | | | | Merge branch 'en/stash-df-fix'Junio C Hamano2022-01-101-0/+24
|\ \ \ \ \ \
| * | | | | | stash: do not return before restoring untracked filesElijah Newren2022-01-041-0/+24
* | | | | | | Merge branch 'ms/t-readme-typofix'Junio C Hamano2022-01-101-1/+1
|\ \ \ \ \ \ \
| * | | | | | | t/README: fix typoMarc Strapetz2022-01-041-1/+1
* | | | | | | | Merge branch 'ja/i18n-similar-messages'Junio C Hamano2022-01-1013-40/+41
|\ \ \ \ \ \ \ \
| * | | | | | | | i18n: turn even more messages into "cannot be used together" onesJean-Noël Avila2022-01-0510-15/+16
| * | | | | | | | i18n: factorize "--foo requires --bar" and the likeJean-Noël Avila2022-01-057-7/+7
| * | | | | | | | i18n: turn "options are incompatible" into "cannot be used together"Jean-Noël Avila2022-01-058-13/+13
| * | | | | | | | i18n: refactor "%s, %s and %s are mutually exclusive"Jean-Noël Avila2022-01-051-3/+3
| * | | | | | | | i18n: refactor "foo and bar are mutually exclusive"Jean-Noël Avila2022-01-052-2/+2
* | | | | | | | | Merge branch 'en/merge-ort-renorm-with-rename-delete-conflict-fix'Junio C Hamano2022-01-101-0/+26
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | merge-ort: fix bug with renormalization and rename/delete conflictsElijah Newren2021-12-301-0/+26
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'js/branch-track-inherit'Junio C Hamano2022-01-105-4/+114
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | branch: add flags and config to inherit trackingJosh Steadmon2021-12-205-1/+111
| * | | | | | | | | branch: accept multiple upstream branches for trackingJosh Steadmon2021-12-201-3/+3
* | | | | | | | | | Merge branch 'jz/apply-3-corner-cases'Junio C Hamano2022-01-101-0/+18
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git-apply: skip threeway in add / rename casesJerry Zhang2021-12-201-0/+18
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'ab/do-not-limit-stash-help-to-push'Junio C Hamano2022-01-101-0/+19
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | stash: don't show "git stash push" usage on bad "git stash" usageÆvar Arnfjörð Bjarmason2021-12-161-0/+19
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'ds/fetch-pull-with-sparse-index'Junio C Hamano2022-01-104-80/+149
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | test-read-cache: remove --table, --expand optionsDerrick Stolee2021-12-221-54/+10
| * | | | | | | | | | t1091/t3705: remove 'test-tool read-cache --table'Derrick Stolee2021-12-222-9/+24
| * | | | | | | | | | t1092: replace 'read-cache --table' with 'ls-files --sparse'Derrick Stolee2021-12-221-17/+14
| * | | | | | | | | | ls-files: add --sparse optionDerrick Stolee2021-12-221-0/+91
| * | | | | | | | | | fetch/pull: use the sparse indexDerrick Stolee2021-12-221-0/+10
* | | | | | | | | | | Merge branch 'hn/ref-api-tests-update'Junio C Hamano2022-01-103-11/+24
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | t7004: use "test-tool ref-store" for reflog inspectionHan-Wen Nienhuys2021-12-221-2/+2
| * | | | | | | | | | | t7004: create separate tags for different testsHan-Wen Nienhuys2021-12-221-11/+11
| * | | | | | | | | | | t5550: require REFFILESHan-Wen Nienhuys2021-12-221-0/+7
| * | | | | | | | | | | t5540: require REFFILESHan-Wen Nienhuys2021-12-221-0/+6
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'ja/perf-use-specified-shell'Junio C Hamano2022-01-101-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | t/perf: do not run tests in user's $SHELLJohannes Altmanninger2021-12-251-1/+1
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'hn/test-ref-store-show-hash-algo'Junio C Hamano2022-01-101-4/+5
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | test-ref-store: print hash algorithmHan-Wen Nienhuys2021-12-211-4/+5
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'ws/fast-export-with-revision-options'Junio C Hamano2022-01-101-0/+32
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | fast-export: fix surprising behavior with --first-parentWilliam Sprent2021-12-211-0/+32
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'ds/sparse-checkout-malformed-pattern-fix'Junio C Hamano2022-01-101-1/+36
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | sparse-checkout: refuse to add to bad patternsDerrick Stolee2021-12-301-2/+5