electria/nixowos
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

docs(defaults/git): add to comments

Browse source
This commit is contained in:
electria 2026-04-26 08:36:53 -07:00
commit 4dd72fdcb9
Signed by: electria
SSH key fingerprint: SHA256:8LlB3ucPbBHqozqkhsNbaV5oG3SlzzqUj8FZDL6IPQs
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
defaults/git.nix
View file

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