summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | mergetools: vimdiff: rework tab logicFelipe Contreras2022-08-101-28/+22
| * | | | | | | | mergetools: vimdiff: fix for diffoptFelipe Contreras2022-08-101-18/+18
| * | | | | | | | mergetools: vimdiff: silence annoying messagesFelipe Contreras2022-08-101-2/+2
| * | | | | | | | mergetools: vimdiff: make vimdiff3 actually workFelipe Contreras2022-08-101-18/+18
| * | | | | | | | mergetools: vimdiff: fix commentFelipe Contreras2022-08-101-2/+2
| |/ / / / / / /
* | | | | | | | Merge branch 'js/safe-directory-plus' into maintJunio C Hamano2022-08-264-15/+81
|\ \ \ \ \ \ \ \
| * | | | | | | | mingw: handle a file owned by the Administrators group correctlyJohannes Schindelin2022-08-081-0/+10
| * | | | | | | | mingw: be more informative when ownership check fails on FAT32Johannes Schindelin2022-08-081-1/+24
| * | | | | | | | mingw: provide details about unsafe directories' ownershipJohannes Schindelin2022-08-081-0/+24
| * | | | | | | | setup: prepare for more detailed "dubious ownership" messagesJohannes Schindelin2022-08-084-13/+21
| * | | | | | | | setup: fix some formattingJohannes Schindelin2022-08-081-4/+5
* | | | | | | | | Merge branch 'pw/use-glibc-tunable-for-malloc-optim' into maintJunio C Hamano2022-08-261-3/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | tests: cache glibc version checkPhillip Wood2022-08-041-3/+8
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'ab/hooks-regression-fix' into maintJunio C Hamano2022-08-262-7/+26
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | hook API: don't segfault on strbuf_addf() to NULL "out"Ævar Arnfjörð Bjarmason2022-08-052-7/+26
* | | | | | | | | | Merge branch 'gc/git-reflog-doc-markup' into maintJunio C Hamano2022-08-261-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Documentation/git-reflog: remove unneeded \ from \{Glen Choo2022-08-011-1/+1
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'js/ort-clean-up-after-failed-merge' into maintJunio C Hamano2022-08-261-0/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | merge-ort: do leave trace2 region even if checkout failsJohannes Schindelin2022-08-011-0/+3
| * | | | | | | | | | merge-ort: clean up after failed mergeJohannes Schindelin2022-08-011-0/+2
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jk/struct-zero-init-with-older-gcc' into maintJunio C Hamano2022-08-261-0/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | config.mak.dev: squelch -Wno-missing-braces for older gccJeff King2022-07-311-0/+4
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'js/lstat-mingw-enotdir-fix' into maintJunio C Hamano2022-08-261-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | lstat(mingw): correctly detect ENOTDIR scenariosJohannes Schindelin2022-07-291-2/+2
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge branch 'js/mingw-with-python' into maintJunio C Hamano2022-08-261-3/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | mingw: remove unneeded `NO_CURL` directiveJohannes Schindelin2022-07-291-1/+0
| * | | | | | | | | | mingw: remove unneeded `NO_GETTEXT` directiveJohannes Schindelin2022-07-291-1/+0
| * | | | | | | | | | windows: include the Python bits when building Git for WindowsJohannes Schindelin2022-07-291-1/+2
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'ca/unignore-local-installation-on-windows' into maintJunio C Hamano2022-08-261-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | cmake: support local installations of gitCarlo Marcelo Arenas Belón2022-07-271-1/+1
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Git 2.37.2v2.37.2Junio C Hamano2022-08-112-1/+25
* | | | | | | | | Merge branch 'jc/string-list-cleanup' into maintJunio C Hamano2022-08-111-2/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | builtin/remote.c: use the right kind of STRING_LIST_INITJunio C Hamano2022-07-211-2/+1
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'mt/pkt-line-comment-tweak' into maintJunio C Hamano2022-08-111-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-111-3/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | t4200: drop irrelevant codeMartin Ågren2022-07-181-3/+0
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'tb/commit-graph-genv2-upgrade-fix' into maintJunio C Hamano2022-08-114-8/+56
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | commit-graph: fix corrupt upgrade from generation v1 to v2Taylor Blau2022-07-162-6/+6
| * | | | | | | | | commit-graph: introduce `repo_find_commit_pos_in_graph()`Taylor Blau2022-07-162-3/+24
| * | | | | | | | | t5318: demonstrate commit-graph generation v2 corruptionTaylor Blau2022-07-161-0/+27
* | | | | | | | | | Merge branch 'tk/untracked-cache-with-uall' into maintJunio C Hamano2022-08-112-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-1110-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-111-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-111-9/+42
|\ \ \ \ \ \ \ \ \ \ \ \