diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-03-28 13:51:20 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-03-28 13:51:20 -0700 |
| commit | 97345145ff33286af6c14260432f5edfb56fdc82 (patch) | |
| tree | 61d807db9d40a6582f39f258d688ce2bd9d2f90b /git-rebase.sh | |
| parent | 9abf65d23ce8700c290fa4f7d834a10ec5b3e327 (diff) | |
| parent | 4f4074077fb0c3a2facc61b333337d024aeeebbf (diff) | |
| download | git-97345145ff33286af6c14260432f5edfb56fdc82.tar.gz | |
Merge branch 'bg/rebase-off-of-previous-branch'
* bg/rebase-off-of-previous-branch:
rebase: allow "-" short-hand for the previous branch
Diffstat (limited to 'git-rebase.sh')
| -rwxr-xr-x | git-rebase.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/git-rebase.sh b/git-rebase.sh index 5f6732bf3d..2c75e9fa0f 100755 --- 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 |