From 0822884f269adaaca3e9f4da19e163943a25d8f2 Mon Sep 17 00:00:00 2001
From: Daniel Kempkens <daniel+git@kempkens.io>
Date: Sat, 13 Apr 2024 13:28:21 +0200
Subject: [PATCH] git: update configuration

---
 home/programs/git.nix | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/home/programs/git.nix b/home/programs/git.nix
index 2d0efe9..804acfa 100644
--- a/home/programs/git.nix
+++ b/home/programs/git.nix
@@ -19,7 +19,12 @@
 
     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";
+      commend = "commit --amend --no-edit";
+      commedit = "commit --amend";
+      graph = "log --graph --all --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(bold white)— %an%C(reset)%C(bold yellow)%d%C(reset)' --abbrev-commit --date=relative";
+      rbi = "rebase --interactive --autosquash --autostash";
+      rbc = "rebase --continue";
+      rbabort = "rebase --abort";
     };
 
     extraConfig = {
@@ -37,8 +42,8 @@
         default = "simple";
       };
 
-      apply = {
-        whitespace = "fix";
+      branch = {
+        sort = "-committerdate";
       };
 
       merge = {
@@ -53,8 +58,8 @@
         enabled = true;
       };
 
-      branch = {
-        sort = "-committerdate";
+      init = {
+        defaultBranch = "master";
       };
 
       color = {
@@ -64,6 +69,10 @@
       column = {
         ui = "auto";
       };
+
+      apply = {
+        whitespace = "fix";
+      };
     };
 
     ignores = [