From ff45670e9726b854c2f58f5665f55ae92310c8b4 Mon Sep 17 00:00:00 2001
From: Josh Hagins <hagins.josh@gmail.com>
Date: Tue, 30 Jun 2015 11:57:55 -0400
Subject: [PATCH] Ensure update is a fast-forward

---
 bin/pyenv-update | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/pyenv-update b/bin/pyenv-update
index 496229d..1d64bfc 100755
--- a/bin/pyenv-update
+++ b/bin/pyenv-update
@@ -43,7 +43,7 @@ verify_repo() {
 update_repo() {
   info "Updating $1..."
   verify_repo "$1" &&
-  ( cd "${repo}" && git pull "${REMOTE}" "${BRANCH}" )
+  ( cd "${repo}" && git pull --no-rebase --ff "${REMOTE}" "${BRANCH}" )
 }
 
 info() {