summary refs log tree commit diff stats
path: root/user/settings
diff options
context:
space:
mode:
authorAlan Pearce2023-06-16 07:35:58 +0200
committerAlan Pearce2023-06-16 07:35:58 +0200
commit95b4c86c6baf848f9c4bec336b3fcd725f9ab27b (patch)
tree8e39fea94672c83182ce892d4dbd124ffef96033 /user/settings
parentc59e49501c81400ff0494fc7b6fb2edd11aca7fe (diff)
downloadnixfiles-95b4c86c6baf848f9c4bec336b3fcd725f9ab27b.tar.lz
nixfiles-95b4c86c6baf848f9c4bec336b3fcd725f9ab27b.tar.zst
nixfiles-95b4c86c6baf848f9c4bec336b3fcd725f9ab27b.zip
git: don't automatically rebase "main" branch
Diffstat (limited to 'user/settings')
-rw-r--r--user/settings/git.nix3
1 files changed, 3 insertions, 0 deletions
diff --git a/user/settings/git.nix b/user/settings/git.nix
index ed47cac6..dfc27de9 100644
--- a/user/settings/git.nix
+++ b/user/settings/git.nix
@@ -50,6 +50,9 @@
       "branch.master" = {
         rebase = false;
       };
+      "branch.main" = {
+        rebase = false;
+      };
     };
     signing = {
       key = "0xCD4BEB92A8D46583";