diff options
| author |  Carlos Martín Nieto <cmn@elego.de> | 2012-03-04 05:41:26 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2012-03-04 23:00:57 -0800 |
| commit | 3c02396adc0d8836bccc4fbc95edbb3ca8c1f508 (patch) | |
| tree | 9e90909d778d21ddc608c1a13eeb6bf49d537cf3 /git-pull.sh | |
| parent | Update draft release notes to 1.7.10 (diff) | |
| download | tgif-3c02396adc0d8836bccc4fbc95edbb3ca8c1f508.tar.xz | |
Make git-{pull,rebase} message without tracking information friendlier
The current message is too long and at too low a level for anybody
to understand it if they don't know about the configuration format
already.
The text about setting up a remote is superfluous and doesn't help
understand or recover from the error that has happened. Show the
usage more prominently and explain how to set up the tracking
information. If there is only one remote, that name is used instead
of the generic <remote>.
Also simplify the message we print on detached HEAD to remove
unnecessary information which is better left for the documentation.
Signed-off-by: Carlos Martín Nieto <cmn@elego.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-pull.sh')
| -rwxr-xr-x | git-pull.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-pull.sh b/git-pull.sh index 434c139f07..2a10047eb7 100755 --- 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." |