From fcc982da8efac5facbb21d9d45ea71a297b79121 Mon Sep 17 00:00:00 2001
From: Stanislav Mekhonoshin <mehonoshin@sc.vsu.ru>
Date: Tue, 14 May 2013 11:36:23 +0400
Subject: [PATCH] Force rebase on pull action

Nobody likes merge commits on pull, cause they pollute history
---
 plugins/git/git.plugin.zsh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 6c016aa6b..3f3394382 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -93,11 +93,11 @@ function current_repository() {
 }
 
 # these aliases take advantage of the previous function
-alias ggpull='git pull origin $(current_branch)'
+alias ggpull='git pull --rebase origin $(current_branch)'
 compdef ggpull=git
 alias ggpush='git push origin $(current_branch)'
 compdef ggpush=git
-alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)'
+alias ggpnp='git pull --rebase origin $(current_branch) && git push origin $(current_branch)'
 compdef ggpnp=git
 
 # Pretty log messages