From: Travis Swicegood <development@domain51.com>
Date: Wed, 24 Apr 2013 12:54:33 +0000 (-0500)
Subject: Merge remote-tracking branch 'markrickert/master'
X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=b8ff0094b8e139339798bbbd428102126f7d0f4f;p=common%2Fbash_it.git

Merge remote-tracking branch 'markrickert/master'

Conflicts:
	aliases/available/git.aliases.bash
---

b8ff0094b8e139339798bbbd428102126f7d0f4f
diff --cc aliases/available/git.aliases.bash
index 40919f3,9a9a106..ab86853
--- a/aliases/available/git.aliases.bash
+++ b/aliases/available/git.aliases.bash
@@@ -11,7 -11,7 +11,8 @@@ alias gst='git status
  alias gs='git status'
  alias gss='git status -s'
  alias gl='git pull'
 +alias gpr='git pull --rebase'
+ alias gpp='git pull && git push'
  alias gup='git fetch && git rebase'
  alias gp='git push'
  alias gpo='git push origin'