diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-05-30 17:11:02 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-05-30 17:11:02 -0700 |
| commit | d103d3d2823b01cfa02edef4f56ef651e49404b8 (patch) | |
| tree | cccd6747cf040d2821bcfd449b96fe4623a70ed5 /combine-diff.c | |
| parent | 10dc9846b82b5f4927d57c6bb657a9352121bebf (diff) | |
| parent | 863c0ed71ef2897414d3f5d9681a25ac1c42d107 (diff) | |
Merge branch 'fixes/2.45.1/2.44' into maint-2.44
* fixes/2.45.1/2.44:
Revert "fsck: warn about symlink pointing inside a gitdir"
Revert "Add a helper function to compare file contents"
clone: drop the protections where hooks aren't run
tests: verify that `clone -c core.hooksPath=/dev/null` works again
Revert "core.hooksPath: add some protection while cloning"
init: use the correct path of the templates directory again
hook: plug a new memory leak
ci: stop installing "gcc-13" for osx-gcc
ci: avoid bare "gcc" for osx-gcc job
ci: drop mention of BREW_INSTALL_PACKAGES variable
send-email: avoid creating more than one Term::ReadLine object
send-email: drop FakeTerm hack
Diffstat (limited to 'combine-diff.c')
0 files changed, 0 insertions, 0 deletions