mirror of
https://github.com/Rain-kl/OpenFlare.git
synced 2026-09-29 22:06:38 +08:00
ryan
a347c33608
Add a repo .gitconfig so merge=ours in .gitattributes can actually run. Disable the Wavelet canary image workflow and keep docker-compose.yaml as the OpenFlare default so a merge cannot ship the wrong product.
11 lines
411 B
INI
11 lines
411 B
INI
# Repo-local Git settings. Git does not load this file automatically.
|
|
# From the clone (or worktree) root:
|
|
# git config include.path ../.gitconfig
|
|
# Worktree-safe:
|
|
# git config include.path "$(git rev-parse --show-toplevel)/.gitconfig"
|
|
# Relative include.path is resolved against .git/config, so ../.gitconfig
|
|
# is the repo root when .git is a directory (non-worktree clone).
|
|
|
|
[merge "ours"]
|
|
driver = true
|