Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'en/keep-cwd' | Junio C Hamano | 2022-01-26 | 1 | -0/+21 |
|\ | |||||
| * | sequencer, stash: fix running from worktree subdir | Elijah Newren | 2022-01-26 | 1 | -0/+21 |
* | | Merge branch 'ab/checkout-branch-info-leakfix' | Junio C Hamano | 2022-01-24 | 1 | -0/+13 |
|\ \ | |||||
| * | | checkout: avoid BUG() when hitting a broken repository | Junio C Hamano | 2022-01-21 | 1 | -0/+13 |
* | | | Merge branch 'js/t1450-making-it-writable-does-not-need-full-posixperm' | Junio C Hamano | 2022-01-14 | 1 | -2/+2 |
|\ \ \ | |||||
| * | | | t1450-fsck: exec-bit is not needed to make loose object writable | Johannes Sixt | 2022-01-13 | 1 | -2/+2 |
* | | | | Merge branch 'fs/gpg-unknown-key-test-fix' | Junio C Hamano | 2022-01-12 | 1 | -20/+2 |
|\ \ \ \ | |||||
| * | | | | t/gpg: simplify test for unknown key | Fabian Stelzer | 2022-01-12 | 1 | -20/+2 |
* | | | | | Merge branch 'ma/windows-dynload-fix' | Junio C Hamano | 2022-01-12 | 1 | -1/+3 |
|\ \ \ \ \ | |||||
| * | | | | | lazyload: use correct calling conventions | Matthias Aßhauer | 2022-01-09 | 1 | -1/+3 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'fs/ssh-signing-key-lifetime' | Junio C Hamano | 2022-01-12 | 1 | -0/+8 |
|\ \ \ \ \ | |||||
| * | | | | | fmt-merge-msg: prevent use-after-free with signed tags | Taylor Blau | 2022-01-10 | 1 | -0/+8 |
* | | | | | | Merge branch 'en/stash-df-fix' | Junio C Hamano | 2022-01-10 | 1 | -0/+24 |
|\ \ \ \ \ \ | |||||
| * | | | | | | stash: do not return before restoring untracked files | Elijah Newren | 2022-01-04 | 1 | -0/+24 |
* | | | | | | | Merge branch 'ms/t-readme-typofix' | Junio C Hamano | 2022-01-10 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | t/README: fix typo | Marc Strapetz | 2022-01-04 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'ja/i18n-similar-messages' | Junio C Hamano | 2022-01-10 | 13 | -40/+41 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | i18n: turn even more messages into "cannot be used together" ones | Jean-Noël Avila | 2022-01-05 | 10 | -15/+16 |
| * | | | | | | | | i18n: factorize "--foo requires --bar" and the like | Jean-Noël Avila | 2022-01-05 | 7 | -7/+7 |
| * | | | | | | | | i18n: turn "options are incompatible" into "cannot be used together" | Jean-Noël Avila | 2022-01-05 | 8 | -13/+13 |
| * | | | | | | | | i18n: refactor "%s, %s and %s are mutually exclusive" | Jean-Noël Avila | 2022-01-05 | 1 | -3/+3 |
| * | | | | | | | | i18n: refactor "foo and bar are mutually exclusive" | Jean-Noël Avila | 2022-01-05 | 2 | -2/+2 |
* | | | | | | | | | Merge branch 'en/merge-ort-renorm-with-rename-delete-conflict-fix' | Junio C Hamano | 2022-01-10 | 1 | -0/+26 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | merge-ort: fix bug with renormalization and rename/delete conflicts | Elijah Newren | 2021-12-30 | 1 | -0/+26 |
| | |_|_|_|/ / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'js/branch-track-inherit' | Junio C Hamano | 2022-01-10 | 5 | -4/+114 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | branch: add flags and config to inherit tracking | Josh Steadmon | 2021-12-20 | 5 | -1/+111 |
| * | | | | | | | | | branch: accept multiple upstream branches for tracking | Josh Steadmon | 2021-12-20 | 1 | -3/+3 |
* | | | | | | | | | | Merge branch 'jz/apply-3-corner-cases' | Junio C Hamano | 2022-01-10 | 1 | -0/+18 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | git-apply: skip threeway in add / rename cases | Jerry Zhang | 2021-12-20 | 1 | -0/+18 |
| | |/ / / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'ab/do-not-limit-stash-help-to-push' | Junio C Hamano | 2022-01-10 | 1 | -0/+19 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | stash: don't show "git stash push" usage on bad "git stash" usage | Ævar Arnfjörð Bjarmason | 2021-12-16 | 1 | -0/+19 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'ds/fetch-pull-with-sparse-index' | Junio C Hamano | 2022-01-10 | 4 | -80/+149 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | test-read-cache: remove --table, --expand options | Derrick Stolee | 2021-12-22 | 1 | -54/+10 |
| * | | | | | | | | | | t1091/t3705: remove 'test-tool read-cache --table' | Derrick Stolee | 2021-12-22 | 2 | -9/+24 |
| * | | | | | | | | | | t1092: replace 'read-cache --table' with 'ls-files --sparse' | Derrick Stolee | 2021-12-22 | 1 | -17/+14 |
| * | | | | | | | | | | ls-files: add --sparse option | Derrick Stolee | 2021-12-22 | 1 | -0/+91 |
| * | | | | | | | | | | fetch/pull: use the sparse index | Derrick Stolee | 2021-12-22 | 1 | -0/+10 |
* | | | | | | | | | | | Merge branch 'hn/ref-api-tests-update' | Junio C Hamano | 2022-01-10 | 3 | -11/+24 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | t7004: use "test-tool ref-store" for reflog inspection | Han-Wen Nienhuys | 2021-12-22 | 1 | -2/+2 |
| * | | | | | | | | | | | t7004: create separate tags for different tests | Han-Wen Nienhuys | 2021-12-22 | 1 | -11/+11 |
| * | | | | | | | | | | | t5550: require REFFILES | Han-Wen Nienhuys | 2021-12-22 | 1 | -0/+7 |
| * | | | | | | | | | | | t5540: require REFFILES | Han-Wen Nienhuys | 2021-12-22 | 1 | -0/+6 |
| |/ / / / / / / / / / | |||||
* | | | | | | | | | | | Merge branch 'ja/perf-use-specified-shell' | Junio C Hamano | 2022-01-10 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | t/perf: do not run tests in user's $SHELL | Johannes Altmanninger | 2021-12-25 | 1 | -1/+1 |
| | |/ / / / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'hn/test-ref-store-show-hash-algo' | Junio C Hamano | 2022-01-10 | 1 | -4/+5 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | test-ref-store: print hash algorithm | Han-Wen Nienhuys | 2021-12-21 | 1 | -4/+5 |
| | |/ / / / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'ws/fast-export-with-revision-options' | Junio C Hamano | 2022-01-10 | 1 | -0/+32 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | fast-export: fix surprising behavior with --first-parent | William Sprent | 2021-12-21 | 1 | -0/+32 |
| | |/ / / / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'ds/sparse-checkout-malformed-pattern-fix' | Junio C Hamano | 2022-01-10 | 1 | -1/+36 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | sparse-checkout: refuse to add to bad patterns | Derrick Stolee | 2021-12-30 | 1 | -2/+5 |