some git experiments
This commit is contained in:
parent
aecd2932f7
commit
4258f49949
1 changed files with 5 additions and 2 deletions
|
@ -19,15 +19,18 @@ in
|
|||
signByDefault = true;
|
||||
};
|
||||
extraConfig = {
|
||||
commit.verbose = true;
|
||||
core = {
|
||||
fsmonitor = true;
|
||||
untrackedCache = true;
|
||||
};
|
||||
diff.algorithm = "histogram";
|
||||
feature.manyFiles = true;
|
||||
fetch.prune = true;
|
||||
init.defaultBranch = "main";
|
||||
merge.conflictstyle = "diff3";
|
||||
merge.conflictstyle = "zdiff3";
|
||||
push.autoSetupRemote = true;
|
||||
pull.rebase = true;
|
||||
pull.ff = "only";
|
||||
};
|
||||
ignores = [ "/.nix" "/.direnv" ];
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue