summaryrefslogtreecommitdiff
path: root/git-rebase.sh
diff options
context:
space:
mode:
authorCarlos Martín Nieto <cmn@elego.de>2012-03-04 05:41:26 +0100
committerJunio C Hamano <gitster@pobox.com>2012-03-04 23:00:57 -0800
commit3c02396adc0d8836bccc4fbc95edbb3ca8c1f508 (patch)
tree9e90909d778d21ddc608c1a13eeb6bf49d537cf3 /git-rebase.sh
parent222433ee4b57750174875ce6b252d10c009a1fa9 (diff)
downloadgit-3c02396adc0d8836bccc4fbc95edbb3ca8c1f508.tar.gz
Make git-{pull,rebase} message without tracking information friendliercn/pull-rebase-message
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-rebase.sh')
-rwxr-xr-xgit-rebase.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase.sh b/git-rebase.sh
index 00ca7b99fe..69c1374823 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -380,7 +380,7 @@ then
then
. git-parse-remote
error_on_missing_default_upstream "rebase" "rebase" \
- "against" "git rebase <upstream branch>"
+ "against" "git rebase <branch>"
fi
;;
*) upstream_name="$1"