diff --git a/home/common.nix b/home/common.nix index 64b5137..1732ed9 100644 --- a/home/common.nix +++ b/home/common.nix @@ -118,6 +118,7 @@ .envrc .kakrc ''}"; + commit.verbose = true; safe.directory = "*"; merge.conflictstyle = "zdiff3"; };