fix(git): use renamed settings.user.{name,email} options
This commit is contained in:
+2
-2
@@ -3,10 +3,10 @@
|
|||||||
{
|
{
|
||||||
programs.git = {
|
programs.git = {
|
||||||
enable = true;
|
enable = true;
|
||||||
userName = "imbytecat";
|
|
||||||
userEmail = "imbytecat@gmail.com";
|
|
||||||
signing.format = null;
|
signing.format = null;
|
||||||
settings = {
|
settings = {
|
||||||
|
user.name = "imbytecat";
|
||||||
|
user.email = "imbytecat@gmail.com";
|
||||||
merge.conflictstyle = "zdiff3";
|
merge.conflictstyle = "zdiff3";
|
||||||
pull.rebase = true;
|
pull.rebase = true;
|
||||||
push.autoSetupRemote = true;
|
push.autoSetupRemote = true;
|
||||||
|
|||||||
Reference in New Issue
Block a user