From 313ee1096a29acf7008090e2683bfc408e443007 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= Date: Fri, 30 Aug 2024 11:14:20 +0300 Subject: [PATCH] git config --global log.date iso-strict-local --- shared/home/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/shared/home/default.nix b/shared/home/default.nix index 449c495..0041161 100644 --- a/shared/home/default.nix +++ b/shared/home/default.nix @@ -169,10 +169,11 @@ in userName = "Motiejus Jakštys"; aliases.yolo = "commit --amend --no-edit -a"; extraConfig = { - rerere.enabled = true; + log.date = "iso-strict-local"; pull.ff = "only"; - merge.conflictstyle = "zdiff3"; init.defaultBranch = "main"; + merge.conflictstyle = "zdiff3"; + rerere.enabled = true; }; };