diff options
Diffstat (limited to 'git-rebase.sh')
| -rwxr-xr-x | git-rebase.sh | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/git-rebase.sh b/git-rebase.sh index 658c003c14..80f2630479 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -451,7 +451,13 @@ then *) upstream_name="$1" if test "$upstream_name" = "-" then - upstream_name="@{-1}" + upstream_name=`git rev-parse --symbolic-full-name @{-1}` + if test -n "$upstream_name" + then + upstream_name=${upstream_name#refs/heads/} + else + upstream_name="@{-1}" + fi fi shift ;; |