diff --git a/git/gitconfig b/git/gitconfig index ffb9b6f..647bbca 100644 --- a/git/gitconfig +++ b/git/gitconfig @@ -13,6 +13,7 @@ visual = "!gitk --all" staged = "diff --staged" + fe = "fetch --all --prune" co = "checkout" ci = "commit" st = "status" @@ -34,7 +35,8 @@ pushall = "!sh -c 'for r in $(git remote) ; do [[ "$r" != "upstream" ]] && { echo \"--- [$r] ---\" ; git push $r \"$@\" ; } ; done' -" - branch-clean = "!sh -c 'git branch --merged | grep -v master | xargs --no-run-if-empty git branch -d'" + branch-clean = "!sh -c 'git branch --merged | grep -v -e master -e develop -e '^*' | xargs --no-run-if-empty git branch -d'" + brc = "!git branch-clean" graph = log --graph --pretty=format:'%C(yellow)%h%Creset%C(bold red)% D%Creset %C(green)(%cr) %C(blue)%an<%ae>%Creset%n %C(bold white)%s%Creset' --all