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; }; };