Let core.excludesfile default to $XDG_CONFIG_HOME/git/ignore

diff --git a/git-rebase.sh b/git-rebase.sh
index 24a2840033c175ff5399de82a1a777c75c0e85dd..e6167374445dfbb5e0b6bedc9a5f33a01cb5a7df 100755 (executable)
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -167,6 +167,7 @@ run_specific_rebase () {
        if [ "$interactive_rebase" = implied ]; then
                GIT_EDITOR=:
                export GIT_EDITOR
+               autosquash=
        fi
        . git-rebase--$type
 }
@@ -423,7 +424,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