Commit Graph
2 Commits
Author SHA1 Message Date
e53ffd0536 Update git hooks with upstream fixes (#4690)
* Make git hooks work in git worktrees (#40038)

Make hooks work in worktrees and cleanup hooks

(cherry picked from commit d3731395b6)

* Replace all usages of /bin/bash shebang with /usr/bin/env (#40756)

Replace all usages of /bin/bash with /usr/bin/env

/usr/bin/env is nearly guaranteed to always exist at that location, which can't be said about /bin/bash and /bin/sh.

Co-authored-by: opl <4833621+opl@users.noreply.github.com>
(cherry picked from commit b9254d9ebf)

---------

Co-authored-by: War Pigeon <54217755+minus1over12@users.noreply.github.com>
Co-authored-by: opl- <opl-@users.noreply.github.com>
Co-authored-by: opl <4833621+opl@users.noreply.github.com>
2025-11-19 07:48:01 -06:00
2f01d7899f Mapping merge driver: continued (#2803)
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
2021-02-06 23:56:40 +01:00