freshlybakedca.ke
Git fork
Merge branch 'ph/rebase-original'
* ph/rebase-original:
rebase: find orig_head unambiguously
+1
-1
git-rebase.sh
+1
-1
git-rebase.sh
+7
t/t3400-rebase.sh
+7
t/t3400-rebase.sh
···
101
101
test $(git rev-parse HEAD@{1}) != $(git rev-parse my-topic-branch@{1})
102
102
'
103
103
104
+
test_expect_success 'rebase from ambiguous branch name' '
105
+
git checkout -b topic side &&
106
+
git rebase master
107
+
'
108
+
104
109
test_expect_success 'rebase after merge master' '
110
+
git checkout --detach refs/tags/topic &&
111
+
git branch -D topic &&
105
112
git reset --hard topic &&
106
113
git merge master &&
107
114
git rebase master &&