diff --git a/modules/beatific.nix b/modules/beatific.nix
index 0566ebc..e7771ca 100644
--- a/modules/beatific.nix
+++ b/modules/beatific.nix
@@ -126,7 +126,15 @@ in {
       programs = {
         git = {
           enable = true;
-          config.init.defaultBranch = "master";
+          config = {
+            init.defaultBranch = "master";
+            merge.conflictstyle = "diff3";
+            alias = {
+              amend = "commit --amend";
+              fixup = "commit --amend --no-edit";
+              pick = "cherry-pick";
+            };
+          };
         };
         htop.enable = true;
       };