Merge branch 'ys/cygstart' into maint

diff --git a/git-rebase.sh b/git-rebase.sh
index b2f1c76dc3ede707870564a8ba73af6d1753e95c..2c692c33e95c4f75a5524a76a8136841cb2e4a57 100755 (executable)
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -473,7 +473,7 @@ case "$#" in
                head_name="detached HEAD"
                branch_name=HEAD ;# detached
        fi
-       orig_head=$(git rev-parse --verify "${branch_name}^0") || exit
+       orig_head=$(git rev-parse --verify HEAD) || exit
        ;;
 *)
        die "BUG: unexpected number of arguments left to parse"