darkkirb/nixos-config
1
0
Fork 0
Code Issues 1 Pull requests 1 Projects Releases Packages Wiki Activity Actions

Merge pull request #346 from DarkKirb/enable-git-rerere

Browse source 
enable autosetupremote and rerere
This commit is contained in:
Charlotte 🦝 Delenk 2024-01-17 09:26:27 +01:00 committed by GitHub
commit e05f03dcd9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/programs/git.nix
View file

@ -13,6 +13,8 @@ desktop: {pkgs, ...}: {
extraConfig = {
init.defaultBranch = "main";
merge.conflictstyle = "diff3";
push.autoSetupRemote = true;
rerere.enabled = true;
};
delta.enable = true;
};