Fix git pull autoconfigure
This commit is contained in:
parent
f101c79e04
commit
427638f243
|
|
@ -25,8 +25,8 @@
|
||||||
|
|
||||||
credentials.helper = "store";
|
credentials.helper = "store";
|
||||||
pull.rebase = false;
|
pull.rebase = false;
|
||||||
push.autoSetupRemove = true;
|
push.autoSetupRemote = true;
|
||||||
branch.autoSetupMerge = true;
|
branch.autoSetupMerge = "always";
|
||||||
init.defaultBranch = "master";
|
init.defaultBranch = "master";
|
||||||
diff.noprefix = true;
|
diff.noprefix = true;
|
||||||
color.ui = "auto";
|
color.ui = "auto";
|
||||||
|
|
|
||||||
|
|
@ -29,6 +29,7 @@
|
||||||
gocryptfs
|
gocryptfs
|
||||||
sshfs
|
sshfs
|
||||||
ncdu
|
ncdu
|
||||||
|
jq
|
||||||
];
|
];
|
||||||
home.sessionVariables = {
|
home.sessionVariables = {
|
||||||
XDG_CONFIG_HOME = "${config.xdg.configHome}";
|
XDG_CONFIG_HOME = "${config.xdg.configHome}";
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue