git zdiff3
parent
5cd83c0f07
commit
0cc16d6689
|
@ -38,6 +38,7 @@ in {
|
||||||
userEmail = "yorick@yorickvanpelt.nl";
|
userEmail = "yorick@yorickvanpelt.nl";
|
||||||
signing.key = "A36E70F9DC014A15";
|
signing.key = "A36E70F9DC014A15";
|
||||||
signing.signByDefault = true;
|
signing.signByDefault = true;
|
||||||
|
extraConfig.merge.conflictStyle = "zdiff3";
|
||||||
extraConfig.help.autocorrect = 5;
|
extraConfig.help.autocorrect = 5;
|
||||||
extraConfig.push.default = "simple";
|
extraConfig.push.default = "simple";
|
||||||
extraConfig.pull.ff = "only";
|
extraConfig.pull.ff = "only";
|
||||||
|
@ -166,6 +167,7 @@ in {
|
||||||
watchman
|
watchman
|
||||||
|
|
||||||
## misc
|
## misc
|
||||||
|
moreutils
|
||||||
atop
|
atop
|
||||||
awscli
|
awscli
|
||||||
borgbackup
|
borgbackup
|
||||||
|
|
Loading…
Reference in New Issue