From 4ccd091af1455aac9427099dbaf89d8fc2eddec0 Mon Sep 17 00:00:00 2001
From: Jacob Hinkle <jacob@jhink.org>
Date: Wed, 28 Sep 2022 12:38:25 -0400
Subject: [PATCH] Update git config

---
 home/jacob.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/home/jacob.nix b/home/jacob.nix
index d9675e5..c5fbff0 100644
--- a/home/jacob.nix
+++ b/home/jacob.nix
@@ -143,7 +143,7 @@
     git = {
       enable = true;
       userName = "Jacob Hinkle";
-      userEmail = "jacob.hinkle@jhink.org";
+      userEmail = "jacob@jhink.org";
       lfs.enable = true;
       difftastic = {
         enable = true;
@@ -154,6 +154,12 @@
         lg = "log --pretty=format:\"%C(magenta)%h%Creset -%C(red)%d%Creset %s %C(dim green)(%cr) [%an]\" --abbrev-commit -30";
         s = "status";
       };
+      extraConfig = {
+        color.ui = "auto";
+        push.default = "simple";
+        pull.rebase = false;
+        branch.autosetupmerge = true;
+      };
     };
     htop.enable = true;
     kitty = {