Update update-fork.sh

Add no edit flag when merging
TusharGupta01 · Nov 22, 2014 · bd2eb59 · bd2eb59
1 parent 43b86a5
commit bd2eb59
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/update-fork.sh b/update-fork.sh
@@ -24,8 +24,8 @@ else
 	fi
 
 	git stash
-	git pull upstream develop
+	git pull --no-edit upstream develop
 	git push origin HEAD
 	git stash pop
 	exit 0
-fi
+fi