From 8273b2c98aa8ced1069ff56f4f3bbd5cbf0272fc Mon Sep 17 00:00:00 2001 From: AtomicCoding Date: Tue, 17 Apr 2018 19:32:36 -0700 Subject: [PATCH] Slight Change --- tools/zim_update | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/zim_update b/tools/zim_update index ddcbca9..e482f7b 100644 --- a/tools/zim_update +++ b/tools/zim_update @@ -34,8 +34,8 @@ else fi cd ${ZIM_HOME} # this is the cleanest way I know how to update a repository -git remote update -p > /dev/null 2>&1 echo -ne "${blue}Updating Zim...${normal}"\\r +git remote update -p > /dev/null 2>&1 output=$(git merge --ff-only @\{u\} 2>&1) if echo "$output" | grep "up to date" > /dev/null; then echo -ne "${blue}Zim at latest version. ${normal}"\\r