home: git: include local-only config file
Useful for configuration options that should remain secret.
This commit is contained in:
parent
5a07dda93b
commit
938fb71f9c
|
@ -120,6 +120,11 @@ in
|
||||||
defaultBranch = "main";
|
defaultBranch = "main";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# Local configuration, not-versioned
|
||||||
|
include = {
|
||||||
|
path = "config.local";
|
||||||
|
};
|
||||||
|
|
||||||
merge = {
|
merge = {
|
||||||
conflictStyle = "zdiff3";
|
conflictStyle = "zdiff3";
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue