Merge changes from work
This commit is contained in:
@ -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;
|
||||
|
||||
Reference in New Issue
Block a user