docs(defaults/git): add to comments

2026-04-26 08:36:53 -07:00 · 2026-04-26 08:36:53 -07:00 · 4dd72fdcb9
commit 4dd72fdcb9
parent f3c3add058
1 changed files with 6 additions and 1 deletions
--- a/defaults/git.nix
+++ b/defaults/git.nix
@ -31,8 +31,13 @@ in
        credential.helper = "cache";

        push.autoSetupRemote = true;
+
+        # otherwise git suggests changing the config
+        # which two people I know have done without understanding
+        # causing further problems
        pull.ff = "only";
-        merge.conflictStyle = "zdiff3";
+
+        merge.conflictStyle = "zdiff3"; # easiest to understand style
        commit.verbose = true; # show diffs in commit editor
      }
      // (lib.optionalAttrs (superCfg.delta.enable && config.nixowos.allowAddingPackages) {