gitweb: Handle other types of tag in git_print_log

diff --git a/git-rebase.sh b/git-rebase.sh
index 00ca7b99fef35e21d24af844e6dbaa92cab5834f..ede9723327e32f312da7d1122912459b502e69bb 100755 (executable)
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -165,6 +165,7 @@ run_specific_rebase () {
        if [ "$interactive_rebase" = implied ]; then
                GIT_EDITOR=:
                export GIT_EDITOR
+               autosquash=
        fi
        . git-rebase--$type
 }
@@ -380,7 +381,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"
@@ -418,7 +419,7 @@ case "$onto_name" in
        ;;
 *)
        onto=$(git rev-parse --verify "${onto_name}^0") ||
-       die "Does not point to a valid commit: $1"
+       die "Does not point to a valid commit: $onto_name"
        ;;
 esac