unpack-trees: print "Aborting" to stderr

[git.git] / git-rebase.sh

diff --git a/git-rebase.sh b/git-rebase.sh
index 7a54bfc6182a567860af023cb7720680d1806c72..d7855ea1c6dae8d8cbe35ae39f9c65e7bc9d7b11 100755 (executable)
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -153,7 +153,9 @@ move_to_original_branch () {
                message="rebase finished: $head_name onto $onto"
                git update-ref -m "$message" \
                        $head_name $(git rev-parse HEAD) $orig_head &&
-               git symbolic-ref HEAD $head_name ||
+               git symbolic-ref \
+                       -m "rebase finished: returning to $head_name" \
+                       HEAD $head_name ||
                die "Could not move back to $head_name"
                ;;
        esac
@@ -332,7 +334,7 @@ abort)
        read_basic_state
        case "$head_name" in
        refs/*)
-               git symbolic-ref HEAD $head_name ||
+               git symbolic-ref -m "rebase: aborting" HEAD $head_name ||
                die "Could not move back to $head_name"
                ;;
        esac