git: set some new-ish config options
This commit is contained in:
parent
d4bb198883
commit
7616d5d06a
1 changed files with 13 additions and 0 deletions
|
@ -18,6 +18,7 @@
|
|||
userEmail = "daniel+git@kempkens.io";
|
||||
|
||||
aliases = {
|
||||
pushf = "push --force-with-lease --force-if-includes";
|
||||
lg = "log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative";
|
||||
};
|
||||
|
||||
|
@ -44,13 +45,25 @@
|
|||
conflictStyle = "zdiff3";
|
||||
};
|
||||
|
||||
rebase = {
|
||||
updateRefs = true;
|
||||
};
|
||||
|
||||
rerere = {
|
||||
enabled = true;
|
||||
};
|
||||
|
||||
branch = {
|
||||
sort = "-committerdate";
|
||||
};
|
||||
|
||||
color = {
|
||||
ui = "auto";
|
||||
};
|
||||
|
||||
column = {
|
||||
ui = "auto";
|
||||
};
|
||||
};
|
||||
|
||||
ignores = [
|
||||
|
|
Loading…
Reference in a new issue