bash: fix gp

This commit is contained in:
Michael Grote 2023-08-14 09:21:40 +02:00
parent 9bb6fb8e49
commit 1761df5220

View file

@ -190,6 +190,9 @@ function glogs {
fi;
git log --pretty=format:'%C(auto) %<|(16,trunc)%h %Cred %G?%Creset %<|(60,trunc)%s %<(20,trunc)%Cgreen%cr%Creset %<(15,trunc)%Cblue%an%Creset %Cred%D' --graph --all -$ncommits
}
function gp {
git pull "$@"
}
function mdtoc {
grep --recursive --include="*.md" ^# | sort --version-sort --field-separator=":" | awk 'BEGIN {FS=":"}{print $2 "&&" $1}' | column --table --separator "&&" --table-truncate 1,2
}
@ -218,7 +221,6 @@ alias ll="ls -lAh"
alias tree="tree -a -I **.git**"
# git
alias gs="git status"
alias gp="git stash && git pull && git stash pop"
alias gf="git fetch"
alias gdel="git add . && git stash && git stash clear"
alias glast="git log -1 HEAD --stat"