mirror of
https://github.com/DeltaV-Station/Delta-v.git
synced 2026-09-29 23:57:29 +00:00
e53ffd0536
* Make git hooks work in git worktrees (#40038) Make hooks work in worktrees and cleanup hooks (cherry picked from commitd3731395b6) * 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 commitb9254d9ebf) --------- 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>
10 lines
222 B
Bash
Executable File
10 lines
222 B
Bash
Executable File
#!/usr/bin/env bash
|
|
|
|
# Add this to .git/config:
|
|
# [merge "mapping-merge-driver"]
|
|
# name = Merge driver for maps
|
|
# driver = Tools/mapping-merge-driver.sh %A %O %B
|
|
|
|
dotnet run --project ./Content.Tools "$@"
|
|
|