Fix git lg

This commit is contained in:
Martin Pander
2024-10-22 12:06:09 +02:00
parent f23c3d413b
commit f9ebfc652f
3 changed files with 11 additions and 7 deletions

View File

@ -11,8 +11,10 @@
br = "branch";
pl = "pull";
ps = "push";
sw = "switch";
mno =" merge --no-ff";
lg = "log --color --graph --pretty=format:'%cred%h%creset -%c(yellow)%d%creset %s %cgreen(%cr)%c(bold blue)<%an>%creset' --abbrev-commit";
lg = "log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%C(bold blue)<%an>%Creset' --abbrev-commit";
cleanup = "!git fetch --prune && git branch -vv | grep ': gone]' | awk '{print $1}' | xargs git branch -D";
};
difftastic.enable = true;
@ -24,6 +26,7 @@
push.default = "matching";
init.defaultBranch = "main";
merge.conflicstyle = "zdiff3";
fetch.prune = true;
};
ignores = [