daniel/dotfiles
1
0
Fork 0
Code Activity Actions

git: update configuration

Browse source
This commit is contained in:
Daniel Kempkens 2024-04-13 13:28:21 +02:00
parent 08890e0c8a
commit 0822884f26
Signed by: daniel
SSH key fingerprint: SHA256:Ks/MyhQYcPRQiwMKLAKquWCdCPe3JXlb1WttgnAoSeM
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
home/programs/git.nix
View file

@ -19,7 +19,12 @@
aliases = { aliases = {
pushf = "push --force-with-lease --force-if-includes"; 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"; commend = "commit --amend --no-edit";
commedit = "commit --amend";
graph = "log --graph --all --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(bold white)— %an%C(reset)%C(bold yellow)%d%C(reset)' --abbrev-commit --date=relative";
rbi = "rebase --interactive --autosquash --autostash";
rbc = "rebase --continue";
rbabort = "rebase --abort";
}; };
extraConfig = { extraConfig = {
@ -37,8 +42,8 @@
default = "simple"; default = "simple";
}; };
apply = { branch = {
whitespace = "fix"; sort = "-committerdate";
}; };
merge = { merge = {
@ -53,8 +58,8 @@
enabled = true; enabled = true;
}; };
branch = { init = {
sort = "-committerdate"; defaultBranch = "master";
}; };
color = { color = {
@ -64,6 +69,10 @@
column = { column = {
ui = "auto"; ui = "auto";
}; };
apply = {
whitespace = "fix";
};
}; };
ignores = [ ignores = [