diff --git a/oscar/configuration.nix b/oscar/configuration.nix
index 476881e..fc035c8 100644
--- a/oscar/configuration.nix
+++ b/oscar/configuration.nix
@@ -157,6 +157,8 @@
         url."ssh://aur@aur.archlinux.org/".pushInsteadOf = "aur:";
         url."ssh://git@github.com/ChandlerSwift/".insteadOf = "gh:";
         push.autoSetupRemote = true;
+        rebase.autosquash = true;
+        fetch.parallel = 0; # "some reasonable default"
       };
       ignores = [
         "*.kate-swp"