diff --git a/files/.gitconfig b/files/.gitconfig index 763eef0..7d44099 100644 --- a/files/.gitconfig +++ b/files/.gitconfig @@ -13,3 +13,7 @@ publish = !sh -c 'BRANCH=$(git symbolic-ref --short HEAD) && \ git fetch . $BRANCH:master' pushblish = !git publish && git push origin master + update-with-master = !sh -c 'BRANCH=$(git symbolic-ref --short HEAD) && \ + git checkout master && git pull -r && git checkout "$BRANCH" && \ + git rebase master' + graph = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all