@@ -92,13 +92,13 @@ define(['d3'], function () {
92
92
}
93
93
94
94
branchIndex = branches . indexOf ( commit . id ) ;
95
-
96
- if ( commit . isNoFFBranch === true ) {
97
- branchIndex ++ ;
98
- }
99
- if ( commit . isNoFFCommit === true ) {
100
- branchIndex -- ;
101
- }
95
+
96
+ if ( commit . isNoFFBranch === true ) {
97
+ branchIndex ++ ;
98
+ }
99
+ if ( commit . isNoFFCommit === true ) {
100
+ branchIndex -- ;
101
+ }
102
102
103
103
if ( parentCY === baseLine ) {
104
104
var direction = 1 ;
@@ -958,14 +958,14 @@ define(['d3'], function () {
958
958
throw new Error ( 'Already up-to-date.' ) ;
959
959
} else if ( currentCommit . parent2 === mergeTarget . id ) {
960
960
throw new Error ( 'Already up-to-date.' ) ;
961
- } else if ( noFF === true ) {
962
- var branchStartCommit = this . getCommit ( mergeTarget . parent ) ;
963
- while ( branchStartCommit . parent !== currentCommit . id ) {
964
- branchStartCommit = this . getCommit ( branchStartCommit . parent ) ;
965
- }
966
-
967
- branchStartCommit . isNoFFBranch = true ;
968
-
961
+ } else if ( noFF === true ) {
962
+ var branchStartCommit = this . getCommit ( mergeTarget . parent ) ;
963
+ while ( branchStartCommit . parent !== currentCommit . id ) {
964
+ branchStartCommit = this . getCommit ( branchStartCommit . parent ) ;
965
+ }
966
+
967
+ branchStartCommit . isNoFFBranch = true ;
968
+
969
969
this . commit ( { parent2 : mergeTarget . id , isNoFFCommit : true } ) ;
970
970
} else if ( this . isAncestor ( currentCommit , mergeTarget ) ) {
971
971
this . fastForward ( mergeTarget ) ;
0 commit comments