summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Git 2.37.3v2.37.3Junio C Hamano2022-08-302-4/+4
* A handful more topics from the 'master' front for 2.37.3Junio C Hamano2022-08-262-1/+47
* Merge branch 'po/doc-add-renormalize' into maintJunio C Hamano2022-08-261-1/+3
|\
| * doc add: renormalize is not idempotent for CRCRLFPhilip Oakley2022-08-101-1/+3
* | Merge branch 'vd/sparse-reset-checkout-fixes' into maintJunio C Hamano2022-08-266-10/+141
|\ \
| * | unpack-trees: unpack new trees as sparse directoriesVictoria Dye2022-08-082-10/+113
| * | cache.h: create 'index_name_pos_sparse()'Victoria Dye2022-08-082-0/+14
| * | oneway_diff: handle removed sparse directoriesVictoria Dye2022-08-081-0/+5
| * | checkout: fix nested sparse directory diff in sparse indexVictoria Dye2022-08-082-0/+9
* | | Merge branch 'jk/fsck-tree-mode-bits-fix' into maintJunio C Hamano2022-08-267-10/+51
|\ \ \
| * | | fsck: downgrade tree badFilemode to "info"Jeff King2022-08-102-1/+18
| * | | fsck: actually detect bad file modes in treesJeff King2022-08-102-1/+15
| * | | tree-walk: add a mechanism for getting non-canonicalized modesJeff King2022-08-104-9/+19
* | | | Merge branch 'fc/vimdiff-layout-vimdiff3-fix' into maintJunio C Hamano2022-08-261-59/+43
|\ \ \ \
| * | | | mergetools: vimdiff: simplify tabfirstFelipe Contreras2022-08-101-25/+19
| * | | | mergetools: vimdiff: fix single window layoutsFelipe Contreras2022-08-101-12/+8
| * | | | 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-07-311-0/+3
| * | | | | | merge-ort: clean up after failed mergeJohannes Schindelin2022-07-311-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-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
|\ \ \ \ \ \ \ \