From d962503a821ae05908ce04793827c0423ba0203d Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Mon, 25 Aug 2014 14:59:02 -0500
Subject: [PATCH] Updated git pull to use --rebase.

---
 .bash_profile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.bash_profile b/.bash_profile
index ebe484e..a2a6b2c 100644
--- a/.bash_profile
+++ b/.bash_profile
@@ -49,7 +49,7 @@ function pretty() {
 # Git aliases.
 alias gs='git status'
 alias gc='git commit'
-alias gp='git pull'
+alias gp='git pull --rebase'
 alias gcam='git commit -am'
 alias gl='git log --graph --pretty=format:"%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset" --abbrev-commit'
 alias gsd='git svn dcommit'