diff --git a/apps/nogui/git.nix b/apps/nogui/git.nix
index 392d2ef..d2f5022 100644
--- a/apps/nogui/git.nix
+++ b/apps/nogui/git.nix
@@ -58,6 +58,10 @@ in
       pull.rebase = true;
       diff.algorithm = "histogram";
       merge.tool = "hx";
+      format = {
+        coverLetter = "auto";
+        useAutoBase = "whenAble";
+      };
       url =
         insteadOf "jo" "git.jolheiser.com"
         // insteadOf "gh" "github.com"