Merge branch 'am/completion-zsh-fix'

diff --git a/git-pull.sh b/git-pull.sh
index 434c139f077ed5b03fef2b70f2eabb66f7147f23..2a10047eb710011213024bd0acc57eec87a6f965 100755 (executable)
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -180,7 +180,7 @@ error_on_no_merge_candidates () {
        elif [ -z "$curr_branch" -o -z "$upstream" ]; then
                . git-parse-remote
                error_on_missing_default_upstream "pull" $op_type $op_prep \
-                       "git pull <repository> <refspec>"
+                       "git pull <remote> <branch>"
        else
                echo "Your configuration specifies to $op_type $op_prep the ref '${upstream#refs/heads/}'"
                echo "from the remote, but no such ref was fetched."