Permalink
Browse files

Favouring git-up in aliases

  • Loading branch information...
jakearchibald committed Sep 1, 2012
1 parent 4082306 commit 5929c2970287dfe95434339306f4c16541713400
Showing with 8 additions and 1 deletion.
  1. +8 −1 git-shortcuts.sh
View
@@ -1,10 +1,17 @@
alias gs='git status'
alias gaa='git add -A'
-alias gp='git pull && git push'
alias gdiff='git diff --color-words'
alias gclean='git gc --prune=now && git remote prune origin'
alias glog='git log --graph --oneline --all --decorate'
+if type git-up -t > /dev/null 2>&1; then
+ alias gup='git-up'
+ alias gp='git-up && git push'
+else
+ alias gup='git pull'
+ alias gp='git pull && git push'
+fi
+
function gc {
git commit -am "$1"
gs

0 comments on commit 5929c29

Please sign in to comment.