mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
rebase: allow "-" short-hand for the previous branch
Teach rebase the same shorthand as checkout and merge to name the branch to rebase the current branch on; that is, that "-" means "the branch we were previously on". Requested-by: Tim Chase <git@tim.thechases.com> Signed-off-by: Brian Gesiak <modocache@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
5f95c9f850
commit
4f4074077f
|
@ -449,6 +449,10 @@ then
|
|||
test "$fork_point" = auto && fork_point=t
|
||||
;;
|
||||
*) upstream_name="$1"
|
||||
if test "$upstream_name" = "-"
|
||||
then
|
||||
upstream_name="@{-1}"
|
||||
fi
|
||||
shift
|
||||
;;
|
||||
esac
|
||||
|
|
|
@ -88,6 +88,23 @@ test_expect_success 'rebase from ambiguous branch name' '
|
|||
git rebase master
|
||||
'
|
||||
|
||||
test_expect_success 'rebase off of the previous branch using "-"' '
|
||||
git checkout master &&
|
||||
git checkout HEAD^ &&
|
||||
git rebase @{-1} >expect.messages &&
|
||||
git merge-base master HEAD >expect.forkpoint &&
|
||||
|
||||
git checkout master &&
|
||||
git checkout HEAD^ &&
|
||||
git rebase - >actual.messages &&
|
||||
git merge-base master HEAD >actual.forkpoint &&
|
||||
|
||||
test_cmp expect.forkpoint actual.forkpoint &&
|
||||
# the next one is dubious---we may want to say "-",
|
||||
# instead of @{-1}, in the message
|
||||
test_i18ncmp expect.messages actual.messages
|
||||
'
|
||||
|
||||
test_expect_success 'rebase a single mode change' '
|
||||
git checkout master &&
|
||||
git branch -D topic &&
|
||||
|
|
Loading…
Reference in a new issue