From 4367a6212fecd6b22f99b0cf1fcf1ceff72b7cba Mon Sep 17 00:00:00 2001
From: Timothy DeHerrera <tim.deh@pm.me>
Date: Sat, 19 Dec 2020 17:42:55 -0700
Subject: [PATCH] users#git: avoid warning on `git pull`

---
 users/profiles/git/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/users/profiles/git/default.nix b/users/profiles/git/default.nix
index c5601d3d..4c9637e5 100644
--- a/users/profiles/git/default.nix
+++ b/users/profiles/git/default.nix
@@ -2,6 +2,10 @@
   programs.git = {
     enable = true;
 
+    extraConfig = {
+      pull.rebase = false;
+    };
+
     aliases = {
       a = "add -p";
       co = "checkout";