about summary refs log tree commit diff
path: root/users/glittershark/system/home/modules/development.nix
diff options
context:
space:
mode:
authorGriffin Smith <grfn@gws.fyi>2021-01-13T15·12-0500
committerglittershark <grfn@gws.fyi>2021-01-13T16·53+0000
commit66763d72e0c6587aab28dc2d5d8308d0dfc9711c (patch)
tree2a2810533a6b2b40b850d9d77388b79a18793427 /users/glittershark/system/home/modules/development.nix
parent41281020aa6683b5b111affaafb9e192310f9272 (diff)
feat(gs/home): Enable git-rerere r/2085
Change-Id: I5a30b554dbda2ba53032bef3ff78b67a4cf95aa4
Reviewed-on: https://cl.tvl.fyi/c/depot/+/2359
Tested-by: BuildkiteCI
Reviewed-by: glittershark <grfn@gws.fyi>
Diffstat (limited to 'users/glittershark/system/home/modules/development.nix')
-rw-r--r--users/glittershark/system/home/modules/development.nix1
1 files changed, 1 insertions, 0 deletions
diff --git a/users/glittershark/system/home/modules/development.nix b/users/glittershark/system/home/modules/development.nix
index 93dc142c2fe6..31dc996551c8 100644
--- a/users/glittershark/system/home/modules/development.nix
+++ b/users/glittershark/system/home/modules/development.nix
@@ -83,6 +83,7 @@ with lib;
     extraConfig = {
       github.user = "glittershark";
       merge.conflictstyle = "diff3";
+      rerere.enabled = "true";
     };
 
     delta = {