1
0
Fork 0

git: set some new-ish config options

This commit is contained in:
Daniel Kempkens 2024-04-12 22:13:16 +02:00
parent d4bb198883
commit 7616d5d06a
Signed by: daniel
SSH key fingerprint: SHA256:Ks/MyhQYcPRQiwMKLAKquWCdCPe3JXlb1WttgnAoSeM

View file

@ -18,6 +18,7 @@
userEmail = "daniel+git@kempkens.io"; userEmail = "daniel+git@kempkens.io";
aliases = { 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"; 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"; conflictStyle = "zdiff3";
}; };
rebase = {
updateRefs = true;
};
rerere = { rerere = {
enabled = true; enabled = true;
}; };
branch = {
sort = "-committerdate";
};
color = { color = {
ui = "auto"; ui = "auto";
}; };
column = {
ui = "auto";
};
}; };
ignores = [ ignores = [