git rebase实战

标签：

develop分支上的commit记录

Administrator@LuJunTao MINGW64 /f/GitMerge/demo (develop)
$ git log
commit f529181aa7aa12794b261b5be57e948792168dd6  C5
Author: ChuckLu <244657538@qq.com>
Date: Tue Aug 11 14:43:21 2015 +0800

1.添加I love you

commit ccdaa5fd698d68854ad43bfc1ddef614ea2441ac  C4
Author: ChuckLu <244657538@qq.com>
Date: Tue Aug 11 14:43:02 2015 +0800

1.删除hello world

commit dc697947fccd64b310d5b910c6c8faca0a6a914d   C3
Author: ChuckLu <244657538@qq.com>
Date: Tue Aug 11 14:41:39 2015 +0800

1.添加world

commit 1f14a3c4a2bb5d9a26b6198733097f6801f6dcb9  C2
Author: ChuckLu <244657538@qq.com>
Date: Tue Aug 11 14:41:15 2015 +0800

1.添加hello

commit caf9736695f78779e9bae77afbc49d97a5e4959c    C1
Author: ChuckLu <244657538@qq.com>
Date: Tue Aug 11 14:40:48 2015 +0800

1.新增一个文件

master分支上的commit记录

Administrator@LuJunTao MINGW64 /f/GitMerge/demo (master)
$ git log
commit 618a561d8084af6b75ee6a9864bd2747c377eff6  C7
Author: ChuckLu <244657538@qq.com>
Date: Tue Aug 11 14:53:54 2015 +0800

添加lu

commit dc7ce42604209cc1cfb0b871043d89fd324830e3  C6
Author: ChuckLu <244657538@qq.com>
Date: Tue Aug 11 14:53:11 2015 +0800

添加chuck

commit dc697947fccd64b310d5b910c6c8faca0a6a914d  C3
Author: ChuckLu <244657538@qq.com>
Date: Tue Aug 11 14:41:39 2015 +0800

1.添加world

commit 1f14a3c4a2bb5d9a26b6198733097f6801f6dcb9  C2
Author: ChuckLu <244657538@qq.com>
Date: Tue Aug 11 14:41:15 2015 +0800

1.添加hello

commit caf9736695f78779e9bae77afbc49d97a5e4959c  C1
Author: ChuckLu <244657538@qq.com>
Date: Tue Aug 11 14:40:48 2015 +0800

1.新增一个文件

develop分支和master分支的共同的父节点

commit dc697947fccd64b310d5b910c6c8faca0a6a914d
Author: ChuckLu <244657538@qq.com>
Date: Tue Aug 11 14:41:39 2015 +0800

1.添加world

C1<--C2<--C3<--C6<--C7      master分支

                     <--C4<--C5      develop分支

git rebase实战

标签：

原文地址：http://www.cnblogs.com/chucklu/p/4747691.html