about summary refs log tree commit diff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/user/aszlig/profiles/workstation/default.nix1
1 files changed, 1 insertions, 0 deletions
diff --git a/modules/user/aszlig/profiles/workstation/default.nix b/modules/user/aszlig/profiles/workstation/default.nix
index 862962db..bf7385ab 100644
--- a/modules/user/aszlig/profiles/workstation/default.nix
+++ b/modules/user/aszlig/profiles/workstation/default.nix
@@ -79,6 +79,7 @@ in {
       rerere.enabled = true;
       rerere.autoupdate = true;
       commit.gpgsign = true;
+      pull.rebase = false;
 
       alias.backport = let
         release = "14.04";