From d8ad6c2cecf21cbd5964e95a74f3707012777672 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9ophile=20Bastian?= Date: Fri, 31 Mar 2017 18:35:41 +0200 Subject: [PATCH] gitconfig: add graph and update-with-master --- files/.gitconfig | 4 ++++ 1 file changed, 4 insertions(+) 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