Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[testcase notes] #30: git rebase test cases scratches #76

Open
dorawyy opened this issue Nov 13, 2017 · 3 comments
Open

[testcase notes] #30: git rebase test cases scratches #76

dorawyy opened this issue Nov 13, 2017 · 3 comments

Comments

@dorawyy
Copy link
Owner

dorawyy commented Nov 13, 2017

git rebase testcases

Intro of git rebase options --> #66

Testcase1: Rebase without merge commits

Start state

wechatimg329

Way1: normal rebase

git checkout mt5
git rebase mt6

wechatimg330

Way2: preserve merges

git checkout mt5
git rebase mt6 --preserve-merges

wechatimg331
wechatimg332

@dorawyy
Copy link
Owner Author

dorawyy commented Nov 13, 2017

Testcase2: Rebase with a merge commit

Start point

wechatimg333

Way1: normal rebase

git checkout mt11
git rebase mt12

wechatimg334
wechatimg335

Way2: --preserve-merges

git checkout mt11
git rebase mt12 --preserve-merges

wechatimg336

wechatimg337
wechatimg338
wechatimg339

@dorawyy
Copy link
Owner Author

dorawyy commented Nov 13, 2017

Testcase3: Fast-forward rebase

wechatimg340

Way1: normal rebase

git checkout mt8
git rebase mt9

Way2: force-rebase

git checkout mt8
git rebase mt9 --force-rebase

Way3: force-rebase, preserve-merges

git checkout mt8
git rebase mt9 --force-rebase --preserve-merges

wechatimg341

@dorawyy
Copy link
Owner Author

dorawyy commented Nov 13, 2017

Rebase- Interactive Mode

Everything is possible in this mode.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

1 participant