diff --git a/modules/beatific.nix b/modules/beatific.nix
index 0bf5df3..b723b13 100644
--- a/modules/beatific.nix
+++ b/modules/beatific.nix
@@ -141,8 +141,26 @@ in {
         git = {
           enable = true;
           config = {
+            column.ui = "auto";
             init.defaultBranch = "master";
-            merge.conflictstyle = "diff3";
+            merge.conflictstyle = "zdiff3";
+            branch.sort = "-committerdate";
+            diff = {
+              algorithm = "histogram";
+              colorMoved = "plain";
+              mnemonicPrefix = true;
+              renames = true;
+            };
+            help.autocorrect = "prompt";
+            commit.verbose = true;
+            rerere = {
+              enabled = true;
+              autoupdate = true;
+            };
+            rebase = {
+              autoSquash = true;
+              autoStash = true;
+            };
             alias = {
               amend = "commit --amend";
               fixup = "commit --amend --no-edit";