gpull: do normal pull in additional to pull --rebase

921d8754 · Vitaly Lipatov · e08882bd · 921d8754
Commit 921d8754 authored Jul 14, 2010 by Vitaly Lipatov
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

gpull bin/gpull +4 -1

No files found.
--- a/bin/gpull
+++ b/bin/gpull
@@ -65,4 +65,7 @@ if [ -n "$CHECKONLY" ] ; then
 fi

 echo "Pull repo from $REPO"
-git pull $REBASE $REPO $@
+git pull $REBASE $REPO $@ || exit
+
+# --rebase do not pull tags
+[ -n "$REBASE" ] && git pull $REPO $@