develop branch
--> dashboard (working branch)
我用git merge --no-ff develop
合并任何上游变为仪表板回滚一个Git合并
git的日志:
commit 88113a64a21bf8a51409ee2a1321442fd08db705
Merge: 981bc20 888a557
Author: XXXX <>
Date: Mon Jul 30 08:16:46 2012 -0500
Merge branch 'develop' into dashboard
commit 888a5572428a372f15a52106b8d74ff910493f01
Author: root <[email protected]>
Date: Sun Jul 29 10:49:21 2012 -0500
fixed end date edit display to have leading 0
commit 167ad941726c876349bfa445873bdcd475eb8cd8
Author: XXXX <>
Date: Sun Jul 29 09:13:24 2012 -0500
合并有大约50 +提交在里面,我想知道如何只是恢复合并,所以仪表板返回到合并前的状态
这是第二部分,如果我没有合并--no-ff
,我没有得到提交'合并分支'开发'到仪表板'..我将如何滚动合并回来?
[撤消Git合并?](http://stackoverflow.com/q/2389361/456814)可能有重复。 – 2014-07-07 04:45:53