From 5271b14975caecbacdda955523f79c9adb302377 Mon Sep 17 00:00:00 2001 From: Jorge Bucaran Date: Tue, 23 Feb 2016 14:47:28 +0900 Subject: [PATCH] Stash changes and pull rebase to update. Fix #103 --- functions/__fisher_path_update.fish | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/functions/__fisher_path_update.fish b/functions/__fisher_path_update.fish index 72e8eee..e4f3f7e 100644 --- a/functions/__fisher_path_update.fish +++ b/functions/__fisher_path_update.fish @@ -1,10 +1,10 @@ function __fisher_path_update -a path pushd $path - debug "Update repository '%s'" "$path" - - git checkout master --quiet ^ /dev/null + git checkout master --quiet + git stash --quiet git pull --rebase origin master --quiet + git stash apply --quiet popd end