Fix git pull autoconfigure

This commit is contained in:
Thomas Avé 2026-06-22 19:30:55 +07:00
parent f101c79e04
commit 427638f243
Signed by: thomasave
SSH Key Fingerprint: SHA256:bvIbWy6TO9+PdMTPzWy6dqkRlVQ3eSky+vQcc9aRIiE
2 changed files with 3 additions and 2 deletions

View File

@ -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";

View File

@ -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}";