Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | mergetools: vimdiff: rework tab logic | Felipe Contreras | 2022-08-10 | 1 | -28/+22 | |
| * | | | | | | | | mergetools: vimdiff: fix for diffopt | Felipe Contreras | 2022-08-10 | 1 | -18/+18 | |
| * | | | | | | | | mergetools: vimdiff: silence annoying messages | Felipe Contreras | 2022-08-10 | 1 | -2/+2 | |
| * | | | | | | | | mergetools: vimdiff: make vimdiff3 actually work | Felipe Contreras | 2022-08-10 | 1 | -18/+18 | |
| * | | | | | | | | mergetools: vimdiff: fix comment | Felipe Contreras | 2022-08-10 | 1 | -2/+2 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge branch 'js/safe-directory-plus' into maint | Junio C Hamano | 2022-08-26 | 4 | -15/+81 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | mingw: handle a file owned by the Administrators group correctly | Johannes Schindelin | 2022-08-08 | 1 | -0/+10 | |
| * | | | | | | | | mingw: be more informative when ownership check fails on FAT32 | Johannes Schindelin | 2022-08-08 | 1 | -1/+24 | |
| * | | | | | | | | mingw: provide details about unsafe directories' ownership | Johannes Schindelin | 2022-08-08 | 1 | -0/+24 | |
| * | | | | | | | | setup: prepare for more detailed "dubious ownership" messages | Johannes Schindelin | 2022-08-08 | 4 | -13/+21 | |
| * | | | | | | | | setup: fix some formatting | Johannes Schindelin | 2022-08-08 | 1 | -4/+5 | |
* | | | | | | | | | Merge branch 'pw/use-glibc-tunable-for-malloc-optim' into maint | Junio C Hamano | 2022-08-26 | 1 | -3/+8 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | tests: cache glibc version check | Phillip Wood | 2022-08-04 | 1 | -3/+8 | |
| | |_|/ / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge branch 'ab/hooks-regression-fix' into maint | Junio C Hamano | 2022-08-26 | 2 | -7/+26 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | hook API: don't segfault on strbuf_addf() to NULL "out" | Ævar Arnfjörð Bjarmason | 2022-08-05 | 2 | -7/+26 | |
* | | | | | | | | | | Merge branch 'gc/git-reflog-doc-markup' into maint | Junio C Hamano | 2022-08-26 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Documentation/git-reflog: remove unneeded \ from \{ | Glen Choo | 2022-08-01 | 1 | -1/+1 | |
| | |/ / / / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'js/ort-clean-up-after-failed-merge' into maint | Junio C Hamano | 2022-08-26 | 1 | -0/+5 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | merge-ort: do leave trace2 region even if checkout fails | Johannes Schindelin | 2022-08-01 | 1 | -0/+3 | |
| * | | | | | | | | | | merge-ort: clean up after failed merge | Johannes Schindelin | 2022-08-01 | 1 | -0/+2 | |
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'jk/struct-zero-init-with-older-gcc' into maint | Junio C Hamano | 2022-08-26 | 1 | -0/+4 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | config.mak.dev: squelch -Wno-missing-braces for older gcc | Jeff King | 2022-07-31 | 1 | -0/+4 | |
| | |/ / / / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'js/lstat-mingw-enotdir-fix' into maint | Junio C Hamano | 2022-08-26 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | lstat(mingw): correctly detect ENOTDIR scenarios | Johannes Schindelin | 2022-07-29 | 1 | -2/+2 | |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'js/mingw-with-python' into maint | Junio C Hamano | 2022-08-26 | 1 | -3/+2 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | mingw: remove unneeded `NO_CURL` directive | Johannes Schindelin | 2022-07-29 | 1 | -1/+0 | |
| * | | | | | | | | | | mingw: remove unneeded `NO_GETTEXT` directive | Johannes Schindelin | 2022-07-29 | 1 | -1/+0 | |
| * | | | | | | | | | | windows: include the Python bits when building Git for Windows | Johannes Schindelin | 2022-07-29 | 1 | -1/+2 | |
| | |/ / / / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'ca/unignore-local-installation-on-windows' into maint | Junio C Hamano | 2022-08-26 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | ||||||
| * | | | | | | | | | cmake: support local installations of git | Carlo Marcelo Arenas Belón | 2022-07-27 | 1 | -1/+1 | |
| | |_|_|_|/ / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Git 2.37.2v2.37.2 | Junio C Hamano | 2022-08-11 | 2 | -1/+25 | |
* | | | | | | | | | Merge branch 'jc/string-list-cleanup' into maint | Junio C Hamano | 2022-08-11 | 1 | -2/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | builtin/remote.c: use the right kind of STRING_LIST_INIT | Junio C Hamano | 2022-07-21 | 1 | -2/+1 | |
| | |_|_|/ / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge branch 'mt/pkt-line-comment-tweak' into maint | Junio C Hamano | 2022-08-11 | 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-11 | 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-11 | 4 | -8/+56 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | commit-graph: fix corrupt upgrade from generation v1 to v2 | Taylor Blau | 2022-07-16 | 2 | -6/+6 | |
| * | | | | | | | | | commit-graph: introduce `repo_find_commit_pos_in_graph()` | Taylor Blau | 2022-07-16 | 2 | -3/+24 | |
| * | | | | | | | | | t5318: demonstrate commit-graph generation v2 corruption | Taylor Blau | 2022-07-16 | 1 | -0/+27 | |
* | | | | | | | | | | Merge branch 'tk/untracked-cache-with-uall' into maint | Junio C Hamano | 2022-08-11 | 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-11 | 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-11 | 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-11 | 1 | -9/+42 | |
|\ \ \ \ \ \ \ \ \ \ \ \ |