mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-07-11 07:04:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

rebase onto commits

Browse source
This commit is contained in:
Peter Cottle 2012-10-21 18:24:45 -07:00
parent 93abdd9043
commit 73cf66b35e
3 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/animationFactory.js
View file

@ -109,8 +109,13 @@ AnimationFactory.prototype.rebaseHighlightPart = function(animationQueue, rebase
var slowTime = fullTime * 2.0;
// we want to highlight all the old commits
var oldCommits = rebaseResponse.toRebaseArray;//.reverse();
var oldCommits = rebaseResponse.toRebaseArray;
// we are either highlighting to a visBranch or a visNode
var visBranch = rebaseResponse.destinationBranch.get('visBranch');
if (!visBranch) {
// in the case where we rebase onto a commit
visBranch = rebaseResponse.destinationBranch.get('visNode');
}
_.each(oldCommits, function(oldCommit) {
var visNode = oldCommit.get('visNode');