Skip to content

Commit 48f7798

Browse files
committed
commit again in master for README changed to tell
1 parent 9dd6d89 commit 48f7798

File tree

1 file changed

+15
-0
lines changed

1 file changed

+15
-0
lines changed

README

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,21 @@ C5: 修改了HelloWorld
4141
C6: 增加了bottle.py
4242
C7: 修改了README
4343

44+
after rebase :
45+
git checkout branch2
46+
git rebase --onto master branch20131029 branch2
47+
git checkout master
48+
git merge branch2
49+
git rebase master branch20131029
50+
git checkout master
51+
git merge branch20131029
52+
git branch -v
53+
# git branch -d branch20131029 branch2
54+
55+
C1 -> C4 -> C7 -> C5' -> C6' -> C2' -> C3'
56+
57+
then commit again in master for README:
58+
4459

4560

4661

0 commit comments

Comments
 (0)