summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Git 2.37.2v2.37.2Junio C Hamano2022-08-102-1/+25
* Merge branch 'jc/string-list-cleanup' into maintJunio C Hamano2022-08-101-2/+1
|\
| * builtin/remote.c: use the right kind of STRING_LIST_INITJunio C Hamano2022-07-201-2/+1
* | Merge branch 'mt/pkt-line-comment-tweak' into maintJunio C Hamano2022-08-101-8/+8
|\ \
| * | pkt-line.h: move comment closer to the associated codeMatheus Tavares2022-07-221-8/+8
| |/
* | Merge branch 'ma/t4200-update' into maintJunio C Hamano2022-08-101-3/+0
|\ \
| * | t4200: drop irrelevant codeMartin Ågren2022-07-181-3/+0
* | | Merge branch 'tb/commit-graph-genv2-upgrade-fix' into maintJunio C Hamano2022-08-104-8/+56
|\ \ \
| * | | commit-graph: fix corrupt upgrade from generation v1 to v2Taylor Blau2022-07-152-6/+6
| * | | commit-graph: introduce `repo_find_commit_pos_in_graph()`Taylor Blau2022-07-152-3/+24
| * | | t5318: demonstrate commit-graph generation v2 corruptionTaylor Blau2022-07-151-0/+27
* | | | Merge branch 'tk/untracked-cache-with-uall' into maintJunio C Hamano2022-08-102-0/+7
|\ \ \ \
| * | | | read-cache: make `do_read_index()` always set up `istate->repo`Martin Ågren2022-07-222-1/+9
* | | | | Merge branch 'mt/checkout-count-fix' into maintJunio C Hamano2022-08-1010-24/+113
|\ \ \ \ \
| * | | | | checkout: fix two bugs on the final count of updated entriesMatheus Tavares2022-07-149-25/+40
| * | | | | checkout: show bug about failed entries being included in final reportMatheus Tavares2022-07-142-1/+53
| * | | | | checkout: document bug where delayed checkout counts entries twiceMatheus Tavares2022-07-141-0/+22
* | | | | | Merge branch 'cl/rerere-train-with-no-sign' into maintJunio C Hamano2022-08-101-1/+1
|\ \ \ \ \ \
| * | | | | | contrib/rerere-train: avoid useless gpg sign in trainingCeleste Liu2022-07-191-1/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'kk/p4-client-name-encoding-fix' into maintJunio C Hamano2022-08-101-9/+42
|\ \ \ \ \ \
| * | | | | | git-p4: refactoring of p4CmdList()Kilian Kilger2022-07-211-11/+42
| * | | | | | git-p4: fix bug with encoding of p4 client nameKilian Kilger2022-07-081-2/+4
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'mb/p4-utf16-crlf' into maintJunio C Hamano2022-08-101-1/+1
|\ \ \ \ \ \
| * | | | | | git-p4: fix CR LF handling for utf16 filesMoritz Baumann2022-07-201-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'hx/lookup-commit-in-graph-fix' into maintJunio C Hamano2022-08-102-1/+48
|\ \ \ \ \ \
| * | | | | | t5330: remove run_with_limited_processses()Han Xin2022-07-121-24/+1
| * | | | | | commit-graph.c: no lazy fetch in lookup_commit_in_graph()Han Xin2022-06-302-1/+71
* | | | | | | Merge branch 'jc/resolve-undo' into maintJunio C Hamano2022-08-103-0/+146
|\ \ \ \ \ \ \
| * | | | | | | fsck: do not dereference NULL while checking resolve-undo dataJunio C Hamano2022-07-111-0/+1
| * | | | | | | revision: mark blobs needed for resolve-undo as reachableJunio C Hamano2022-06-093-0/+145
| |/ / / / / /
* | | | | | | Downmerge a bit more for 2.37.xJunio C Hamano2022-08-051-0/+17
* | | | | | | Merge branch 'sg/index-format-doc-update' into maintJunio C Hamano2022-08-051-2/+0
|\ \ \ \ \ \ \
| * | | | | | | index-format.txt: remove outdated list of supported extensionsSZEDER Gábor2022-07-181-2/+0
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'ma/sparse-checkout-cone-doc-fix' into maintJunio C Hamano2022-08-051-2/+2
|\ \ \ \ \ \ \
| * | | | | | | config/core.txt: fix minor issues for `core.sparseCheckoutCone`Martin Ågren2022-07-181-2/+2
| |/ / / / / /
* | | | | | | Merge branch 'ds/win-syslog-compiler-fix' into maintJunio C Hamano2022-08-051-3/+4
|\ \ \ \ \ \ \
| * | | | | | | compat/win32: correct for incorrect compiler warningDerrick Stolee2022-07-191-3/+4
| |/ / / / / /
* | | | | | | Merge branch 'ld/osx-keychain-usage-fix' into maintJunio C Hamano2022-08-051-1/+1
|\ \ \ \ \ \ \
| * | | | | | | osx-keychain: fix compiler warningLessley Dennington2022-07-191-1/+1
| |/ / / / / /
* | | | | | | Merge branch 'ds/doc-wo-whitelist' into maintJunio C Hamano2022-08-0511-40/+39
|\ \ \ \ \ \ \
| * | | | | | | transport.c: avoid "whitelist"Derrick Stolee2022-07-191-4/+4
| * | | | | | | t: avoid "whitelist"Derrick Stolee2022-07-194-8/+7
| * | | | | | | git.txt: remove redundant languageDerrick Stolee2022-07-191-3/+1
| * | | | | | | git-cvsserver: clarify directory listDerrick Stolee2022-07-193-11/+12
| * | | | | | | daemon: clarify directory argumentsDerrick Stolee2022-07-192-14/+15
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'mb/config-document-include' into maintJunio C Hamano2022-08-053-0/+21
|\ \ \ \ \ \ \
| * | | | | | | config.txt: document include, includeIfManuel Boni2022-07-173-0/+21
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'rs/mingw-tighten-mkstemp' into maintJunio C Hamano2022-08-051-4/+1
|\ \ \ \ \ \ \
| * | | | | | | mingw: avoid mktemp() in mkstemp() implementationRené Scharfe2022-07-141-4/+1
| |/ / / / / /
* | | | | | | Merge branch 'jk/clone-unborn-confusion' into maintJunio C Hamano2022-08-053-39/+117
|\ \ \ \ \ \ \