chore(git): set pull strategy to merge by default
This commit is contained in:
@@ -124,6 +124,7 @@
|
|||||||
name = "0xWheatyz";
|
name = "0xWheatyz";
|
||||||
email = "wyatt@leeworks.dev";
|
email = "wyatt@leeworks.dev";
|
||||||
};
|
};
|
||||||
|
pull.rebase = "false";
|
||||||
init.defaultBranch = "master";
|
init.defaultBranch = "master";
|
||||||
push.autoSetupRemote = "true";
|
push.autoSetupRemote = "true";
|
||||||
alias.lg = "log --graph --pretty=format:'%C(yellow)%h%Creset -%C(red)%d%Creset %s %Cgreen(%cr)%Creset %C(bold blue)<%an>%Creset' --abbrev-commit";
|
alias.lg = "log --graph --pretty=format:'%C(yellow)%h%Creset -%C(red)%d%Creset %s %Cgreen(%cr)%Creset %C(bold blue)<%an>%Creset' --abbrev-commit";
|
||||||
|
|||||||
Reference in New Issue
Block a user