From 7616d5d06a06a3b460b88fafc84af7277fc46f3b Mon Sep 17 00:00:00 2001
From: Daniel Kempkens <daniel+git@kempkens.io>
Date: Fri, 12 Apr 2024 22:13:16 +0200
Subject: [PATCH] git: set some new-ish config options

---
 home/programs/git.nix | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/home/programs/git.nix b/home/programs/git.nix
index f3b43de..2d0efe9 100644
--- a/home/programs/git.nix
+++ b/home/programs/git.nix
@@ -18,6 +18,7 @@
     userEmail = "daniel+git@kempkens.io";
 
     aliases = {
+      pushf = "push --force-with-lease --force-if-includes";
       lg = "log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative";
     };
 
@@ -44,13 +45,25 @@
         conflictStyle = "zdiff3";
       };
 
+      rebase = {
+        updateRefs = true;
+      };
+
       rerere = {
         enabled = true;
       };
 
+      branch = {
+        sort = "-committerdate";
+      };
+
       color = {
         ui = "auto";
       };
+
+      column = {
+        ui = "auto";
+      };
     };
 
     ignores = [