nix fmt
This commit is contained in:
parent
095e882e50
commit
aac613ee27
|
@ -44,7 +44,7 @@
|
||||||
extraConfig = {
|
extraConfig = {
|
||||||
credential.helper = "cache";
|
credential.helper = "cache";
|
||||||
push.default = "simple";
|
push.default = "simple";
|
||||||
push.forceIfIncludes = true; # avoid accidental force overrides when remote is autofetched in background
|
push.forceIfIncludes = true; # avoid accidental force overrides when remote is autofetched in background
|
||||||
init.defaultBranch = "mainline";
|
init.defaultBranch = "mainline";
|
||||||
diff.tool = "vimdiff";
|
diff.tool = "vimdiff";
|
||||||
merge.tool = "vimdiff";
|
merge.tool = "vimdiff";
|
||||||
|
@ -81,7 +81,11 @@
|
||||||
settings = {
|
settings = {
|
||||||
git = {
|
git = {
|
||||||
autoFetch = false;
|
autoFetch = false;
|
||||||
mainBranches = ["main" "master" "mainline"];
|
mainBranches = [
|
||||||
|
"main"
|
||||||
|
"master"
|
||||||
|
"mainline"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
update.method = "never";
|
update.method = "never";
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue