Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Git 2.37.2v2.37.2 | Junio C Hamano | 2022-08-10 | 2 | -1/+25 |
* | Merge branch 'jc/string-list-cleanup' into maint | Junio C Hamano | 2022-08-10 | 1 | -2/+1 |
|\ | |||||
| * | builtin/remote.c: use the right kind of STRING_LIST_INIT | Junio C Hamano | 2022-07-20 | 1 | -2/+1 |
* | | Merge branch 'mt/pkt-line-comment-tweak' into maint | Junio C Hamano | 2022-08-10 | 1 | -8/+8 |
|\ \ | |||||
| * | | pkt-line.h: move comment closer to the associated code | Matheus Tavares | 2022-07-22 | 1 | -8/+8 |
| |/ | |||||
* | | Merge branch 'ma/t4200-update' into maint | Junio C Hamano | 2022-08-10 | 1 | -3/+0 |
|\ \ | |||||
| * | | t4200: drop irrelevant code | Martin Ågren | 2022-07-18 | 1 | -3/+0 |
* | | | Merge branch 'tb/commit-graph-genv2-upgrade-fix' into maint | Junio C Hamano | 2022-08-10 | 4 | -8/+56 |
|\ \ \ | |||||
| * | | | commit-graph: fix corrupt upgrade from generation v1 to v2 | Taylor Blau | 2022-07-15 | 2 | -6/+6 |
| * | | | commit-graph: introduce `repo_find_commit_pos_in_graph()` | Taylor Blau | 2022-07-15 | 2 | -3/+24 |
| * | | | t5318: demonstrate commit-graph generation v2 corruption | Taylor Blau | 2022-07-15 | 1 | -0/+27 |
* | | | | Merge branch 'tk/untracked-cache-with-uall' into maint | Junio C Hamano | 2022-08-10 | 2 | -0/+7 |
|\ \ \ \ | |||||
| * | | | | read-cache: make `do_read_index()` always set up `istate->repo` | Martin Ågren | 2022-07-22 | 2 | -1/+9 |
* | | | | | Merge branch 'mt/checkout-count-fix' into maint | Junio C Hamano | 2022-08-10 | 10 | -24/+113 |
|\ \ \ \ \ | |||||
| * | | | | | checkout: fix two bugs on the final count of updated entries | Matheus Tavares | 2022-07-14 | 9 | -25/+40 |
| * | | | | | checkout: show bug about failed entries being included in final report | Matheus Tavares | 2022-07-14 | 2 | -1/+53 |
| * | | | | | checkout: document bug where delayed checkout counts entries twice | Matheus Tavares | 2022-07-14 | 1 | -0/+22 |
* | | | | | | Merge branch 'cl/rerere-train-with-no-sign' into maint | Junio C Hamano | 2022-08-10 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | contrib/rerere-train: avoid useless gpg sign in training | Celeste Liu | 2022-07-19 | 1 | -1/+1 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge branch 'kk/p4-client-name-encoding-fix' into maint | Junio C Hamano | 2022-08-10 | 1 | -9/+42 |
|\ \ \ \ \ \ | |||||
| * | | | | | | git-p4: refactoring of p4CmdList() | Kilian Kilger | 2022-07-21 | 1 | -11/+42 |
| * | | | | | | git-p4: fix bug with encoding of p4 client name | Kilian Kilger | 2022-07-08 | 1 | -2/+4 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'mb/p4-utf16-crlf' into maint | Junio C Hamano | 2022-08-10 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | git-p4: fix CR LF handling for utf16 files | Moritz Baumann | 2022-07-20 | 1 | -1/+1 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'hx/lookup-commit-in-graph-fix' into maint | Junio C Hamano | 2022-08-10 | 2 | -1/+48 |
|\ \ \ \ \ \ | |||||
| * | | | | | | t5330: remove run_with_limited_processses() | Han Xin | 2022-07-12 | 1 | -24/+1 |
| * | | | | | | commit-graph.c: no lazy fetch in lookup_commit_in_graph() | Han Xin | 2022-06-30 | 2 | -1/+71 |
* | | | | | | | Merge branch 'jc/resolve-undo' into maint | Junio C Hamano | 2022-08-10 | 3 | -0/+146 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | fsck: do not dereference NULL while checking resolve-undo data | Junio C Hamano | 2022-07-11 | 1 | -0/+1 |
| * | | | | | | | revision: mark blobs needed for resolve-undo as reachable | Junio C Hamano | 2022-06-09 | 3 | -0/+145 |
| |/ / / / / / | |||||
* | | | | | | | Downmerge a bit more for 2.37.x | Junio C Hamano | 2022-08-05 | 1 | -0/+17 |
* | | | | | | | Merge branch 'sg/index-format-doc-update' into maint | Junio C Hamano | 2022-08-05 | 1 | -2/+0 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | index-format.txt: remove outdated list of supported extensions | SZEDER Gábor | 2022-07-18 | 1 | -2/+0 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'ma/sparse-checkout-cone-doc-fix' into maint | Junio C Hamano | 2022-08-05 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | config/core.txt: fix minor issues for `core.sparseCheckoutCone` | Martin Ågren | 2022-07-18 | 1 | -2/+2 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'ds/win-syslog-compiler-fix' into maint | Junio C Hamano | 2022-08-05 | 1 | -3/+4 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | compat/win32: correct for incorrect compiler warning | Derrick Stolee | 2022-07-19 | 1 | -3/+4 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'ld/osx-keychain-usage-fix' into maint | Junio C Hamano | 2022-08-05 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | osx-keychain: fix compiler warning | Lessley Dennington | 2022-07-19 | 1 | -1/+1 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'ds/doc-wo-whitelist' into maint | Junio C Hamano | 2022-08-05 | 11 | -40/+39 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | transport.c: avoid "whitelist" | Derrick Stolee | 2022-07-19 | 1 | -4/+4 |
| * | | | | | | | t: avoid "whitelist" | Derrick Stolee | 2022-07-19 | 4 | -8/+7 |
| * | | | | | | | git.txt: remove redundant language | Derrick Stolee | 2022-07-19 | 1 | -3/+1 |
| * | | | | | | | git-cvsserver: clarify directory list | Derrick Stolee | 2022-07-19 | 3 | -11/+12 |
| * | | | | | | | daemon: clarify directory arguments | Derrick Stolee | 2022-07-19 | 2 | -14/+15 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'mb/config-document-include' into maint | Junio C Hamano | 2022-08-05 | 3 | -0/+21 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | config.txt: document include, includeIf | Manuel Boni | 2022-07-17 | 3 | -0/+21 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge branch 'rs/mingw-tighten-mkstemp' into maint | Junio C Hamano | 2022-08-05 | 1 | -4/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | mingw: avoid mktemp() in mkstemp() implementation | René Scharfe | 2022-07-14 | 1 | -4/+1 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'jk/clone-unborn-confusion' into maint | Junio C Hamano | 2022-08-05 | 3 | -39/+117 |
|\ \ \ \ \ \ \ |