From 2c73f54b2a194f9de0b7872c40174c8ec0dbf9c9 Mon Sep 17 00:00:00 2001
From: Jonathan Dahan <jonathan@jedahan.com>
Date: Sun, 29 Jan 2012 22:22:45 -0500
Subject: [PATCH] rebase when merging

---
 functions/update-omz | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/functions/update-omz b/functions/update-omz
index 3a24330f..3302d4b8 100644
--- a/functions/update-omz
+++ b/functions/update-omz
@@ -21,7 +21,7 @@ cd $OMZ_HOME
 zstyle -t ':omz:function:update-omz' auto-commit || local nocommit='--no-commit'
 zstyle -t ':omz:function:update-omz' upstream '_upstream'
 
-if git pull $nocommit --strategy=recursive -X ours ${_upstream:-origin} master; then
+if git pull --rebase $nocommit --strategy=recursive -X ours ${_upstream:-origin} master; then
   zstyle -t ':omz:function:update-omz' color && printf "$FG[blue]"
   printf 'Hooray! oh-my-zsh is up-to-date :)\n'
 else