mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(gs/home): Enable git-rerere

Browse source 
Change-Id: I5a30b554dbda2ba53032bef3ff78b67a4cf95aa4
Reviewed-on: https://cl.tvl.fyi/c/depot/+/2359
Tested-by: BuildkiteCI
Reviewed-by: glittershark <grfn@gws.fyi>
This commit is contained in:
Griffin Smith 2021-01-13 10:12:59 -05:00 committed by glittershark
parent 41281020aa
commit 66763d72e0
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
users/glittershark/system/home/modules/development.nix
View file

@ -83,6 +83,7 @@ with lib;
extraConfig = { extraConfig = {
github.user = "glittershark"; github.user = "glittershark";
merge.conflictstyle = "diff3"; merge.conflictstyle = "diff3";
rerere.enabled = "true";
}; };
delta = { delta = {