Merge branch 'bg/rebase-off-of-previous-branch'

diff --git a/git-rebase.sh b/git-rebase.sh
index 5f6732bf3dce78966da1cbb83d4094d584f92598..2c75e9fa0f8d4c10e6caa2b3f4d018a11bbf0f8f 100755 (executable)
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -453,6 +453,10 @@ then
                test "$fork_point" = auto && fork_point=t
                ;;
        *)      upstream_name="$1"
+               if test "$upstream_name" = "-"
+               then
+                       upstream_name="@{-1}"
+               fi
                shift
                ;;
        esac