From 92d9580df3f12db42886efbc3ca979ca6495c281 Mon Sep 17 00:00:00 2001 From: Griffin Smith Date: Wed, 22 Dec 2021 16:21:22 -0500 Subject: feat(grfn/home): Set git.config.advice.skippedCherryPicks=false 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 Autosubmit: grfn --- users/grfn/system/home/modules/development.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/users/grfn/system/home/modules/development.nix b/users/grfn/system/home/modules/development.nix index 1a5e912916..653ce5d83a 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 = { -- cgit 1.4.1