Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'js/drop-mingw-test-cmp' | Junio C Hamano | 2023-01-08 | 2 | -67/+1 |
|\ | |||||
| * | tests(mingw): avoid very slow `mingw_test_cmp` | Johannes Schindelin | 2022-12-12 | 2 | -67/+1 |
* | | Merge branch 'ab/no-more-git-global-super-prefix' | Junio C Hamano | 2023-01-05 | 4 | -30/+115 |
|\ \ | |||||
| * | | read-tree: add "--super-prefix" option, eliminate global | Ævar Arnfjörð Bjarmason | 2022-12-26 | 2 | -2/+2 |
| * | | submodule--helper: don't use global --super-prefix in "absorbgitdirs" | Ævar Arnfjörð Bjarmason | 2022-12-26 | 1 | -22/+14 |
| * | | read-tree + fetch tests: test failing "--super-prefix" interaction | Glen Choo | 2022-12-26 | 1 | -0/+43 |
| * | | submodule absorbgitdirs tests: add missing "Migrating git..." tests | Ævar Arnfjörð Bjarmason | 2022-12-26 | 1 | -7/+57 |
* | | | Merge branch 'ab/bundle-wo-args' | Junio C Hamano | 2023-01-05 | 1 | -0/+7 |
|\ \ \ | |||||
| * | | | bundle: don't segfault on "git bundle <subcmd>" | Ævar Arnfjörð Bjarmason | 2022-12-25 | 1 | -0/+7 |
* | | | | Merge branch 'sg/test-oid-wo-incomplete-line' | Junio C Hamano | 2023-01-05 | 6 | -9/+10 |
|\ \ \ \ | |||||
| * | | | | tests: make 'test_oid' print trailing newline | SZEDER Gábor | 2022-12-19 | 6 | -9/+10 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'sa/cat-file-mailmap--batch-check' | Junio C Hamano | 2023-01-05 | 1 | -0/+65 |
|\ \ \ \ | |||||
| * | | | | cat-file: add mailmap support to --batch-check option | Siddharth Asthana | 2022-12-20 | 1 | -0/+36 |
| * | | | | cat-file: add mailmap support to -s option | Siddharth Asthana | 2022-12-20 | 1 | -0/+29 |
* | | | | | Merge branch 'ew/format-patch-mboxrd' | Junio C Hamano | 2023-01-02 | 2 | -3/+5 |
|\ \ \ \ \ | |||||
| * | | | | | format-patch: support format.mboxrd with --stdout | Eric Wong | 2022-12-25 | 2 | -3/+5 |
* | | | | | | Merge branch 'ds/bundle-uri-4' | Junio C Hamano | 2023-01-02 | 10 | -2/+503 |
|\ \ \ \ \ \ | |||||
| * | | | | | | clone: unbundle the advertised bundles | Derrick Stolee | 2022-12-25 | 2 | -2/+78 |
| * | | | | | | bundle-uri: allow relative URLs in bundle lists | Derrick Stolee | 2022-12-25 | 2 | -0/+84 |
| * | | | | | | bundle-uri: serve bundle.* keys from config | Derrick Stolee | 2022-12-25 | 1 | -0/+32 |
| * | | | | | | bundle-uri client: add helper for testing server | Ævar Arnfjörð Bjarmason | 2022-12-25 | 2 | -0/+92 |
| * | | | | | | bundle-uri client: add boolean transfer.bundleURI setting | Ævar Arnfjörð Bjarmason | 2022-12-25 | 1 | -1/+18 |
| * | | | | | | clone: request the 'bundle-uri' command when available | Ævar Arnfjörð Bjarmason | 2022-12-25 | 1 | -0/+19 |
| * | | | | | | t: create test harness for 'bundle-uri' command | Ævar Arnfjörð Bjarmason | 2022-12-25 | 6 | -1/+144 |
| * | | | | | | protocol v2: add server-side "bundle-uri" skeleton | Ævar Arnfjörð Bjarmason | 2022-12-25 | 1 | -1/+39 |
* | | | | | | | Merge branch 'lk/line-range-parsing-fix' | Junio C Hamano | 2023-01-02 | 1 | -0/+22 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | line-range: fix infinite loop bug with '$' regex | Lars Kellogg-Stedman | 2022-12-20 | 1 | -0/+22 |
| | |_|_|_|/ / | |/| | | | | | |||||
| * | | | | | | rebase --update-refs: avoid unintended ref deletion | Victoria Dye | 2022-12-09 | 1 | -0/+107 |
* | | | | | | | Merge branch 'sa/git-var-sequence-editor' | Junio C Hamano | 2022-12-28 | 1 | -0/+38 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | var: add GIT_SEQUENCE_EDITOR variable | Sean Allred | 2022-12-18 | 1 | -0/+38 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge branch 'pg/diff-stat-unmerged-regression-fix' | Junio C Hamano | 2022-12-26 | 1 | -0/+10 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | diff: fix regression with --stat and unmerged file | Peter Grayson | 2022-12-15 | 1 | -0/+10 |
* | | | | | | | | Merge branch 'jk/ref-filter-error-reporting-fix' | Junio C Hamano | 2022-12-26 | 1 | -0/+18 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | ref-filter: truncate atom names in error messages | Jeff King | 2022-12-15 | 1 | -0/+6 |
| * | | | | | | | | ref-filter: factor out "unrecognized %(foo) arg" errors | Jeff King | 2022-12-15 | 1 | -0/+6 |
| * | | | | | | | | ref-filter: factor out "%(foo) does not take arguments" errors | Jeff King | 2022-12-15 | 1 | -0/+6 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'sg/help-autocorrect-config-fix' | Junio C Hamano | 2022-12-26 | 1 | -0/+6 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | |||||
| * | | | | | | | help.c: fix autocorrect in work tree for bare repository | Simon Gerber | 2022-12-13 | 1 | -0/+6 |
* | | | | | | | | Merge branch 'rj/branch-copy-and-rename' | Junio C Hamano | 2022-12-19 | 1 | -0/+10 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | branch: force-copy a branch to itself via @{-1} is a no-op | Rubén Justo | 2022-11-17 | 1 | -0/+10 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'rr/status-untracked-advice' | Junio C Hamano | 2022-12-19 | 1 | -0/+70 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | status: modernize git-status "slow untracked files" advice | Rudy Rigot | 2022-12-01 | 1 | -0/+70 |
* | | | | | | | | | Merge branch 'aw/complete-case-insensitive' | Junio C Hamano | 2022-12-19 | 1 | -0/+30 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | completion: add case-insensitive match of pseudorefs | Alison Winters | 2022-11-30 | 1 | -0/+15 |
| * | | | | | | | | | completion: add optional ignore-case when matching refs | Alison Winters | 2022-11-30 | 1 | -0/+15 |
* | | | | | | | | | | Merge branch 'rs/t3920-crlf-eating-grep-fix' | Junio C Hamano | 2022-12-19 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | t3920: support CR-eating grep | René Scharfe | 2022-12-07 | 1 | -1/+1 |
* | | | | | | | | | | | Merge branch 'js/t3920-shell-and-or-fix' | Junio C Hamano | 2022-12-19 | 1 | -1/+1 |
|\| | | | | | | | | | | |||||
| * | | | | | | | | | | t3920: don't ignore errors of more than one command with `|| true` | Johannes Sixt | 2022-12-05 | 1 | -1/+1 |
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'ab/t4023-avoid-losing-exit-status-of-diff' | Junio C Hamano | 2022-12-19 | 1 | -6/+6 |
|\ \ \ \ \ \ \ \ \ \ |