about summary refs log tree commit diff
path: root/users/grfn/system/home
diff options
context:
space:
mode:
authorGriffin Smith <grfn@gws.fyi>2021-12-22T21·21-0500
committerclbot <clbot@tvl.fyi>2021-12-24T17·43+0000
commit92d9580df3f12db42886efbc3ca979ca6495c281 (patch)
tree55a1195a4e7f82fead692c93d9990477e318119c /users/grfn/system/home
parent003cfa3e08a07439ffcd60b6f0121ed5c035e268 (diff)
feat(grfn/home): Set git.config.advice.skippedCherryPicks=false r/3353
Git recently started warning about this behavior, which it's always had
and I've always liked, and I don't want the warning.

Change-Id: I19ae397770b271924cc975e5f8c50d6351ed29ce
Reviewed-on: https://cl.tvl.fyi/c/depot/+/4569
Tested-by: BuildkiteCI
Reviewed-by: grfn <grfn@gws.fyi>
Autosubmit: grfn <grfn@gws.fyi>
Diffstat (limited to 'users/grfn/system/home')
-rw-r--r--users/grfn/system/home/modules/development.nix1
1 files changed, 1 insertions, 0 deletions
diff --git a/users/grfn/system/home/modules/development.nix b/users/grfn/system/home/modules/development.nix
index 1a5e912916f8..653ce5d83ae1 100644
--- a/users/grfn/system/home/modules/development.nix
+++ b/users/grfn/system/home/modules/development.nix
@@ -101,6 +101,7 @@ with lib;
       github.user = "glittershark";
       merge.conflictstyle = "diff3";
       rerere.enabled = "true";
+      advice.skippedCherryPicks = "false";
     };
 
     delta = {