undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rebase: allow "-" short-hand for the previous branch

Browse Source 
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:
Brian Gesiak 2014-03-19 20:02:15 +09:00 committed by Junio C Hamano
parent 5f95c9f850
commit 4f4074077f
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
git-rebase.sh
View File

@ -449,6 +449,10 @@ then
test "$fork_point" = auto && fork_point=t test "$fork_point" = auto && fork_point=t
;; ;;
*) upstream_name="$1" *) upstream_name="$1"
if test "$upstream_name" = "-"
then
upstream_name="@{-1}"
fi
shift shift
;; ;;
esac esac

17
t/t3400-rebase.sh
View File

@ -88,6 +88,23 @@ test_expect_success 'rebase from ambiguous branch name' '
git rebase master 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' ' test_expect_success 'rebase a single mode change' '
git checkout master && git checkout master &&
git branch -D topic && git branch -D topic &&