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

merge animation fix

Browse source
This commit is contained in:
Peter Cottle 2012-10-30 14:05:19 -07:00
parent 239f7cf0a2
commit 103ea281ff
1 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/git.js
View file

@ -1044,6 +1044,12 @@ GitEngine.prototype.mergeStarter = function() {
var newCommit = this.merge(this.generalArgs[0], this.generalArgs[1]); var newCommit = this.merge(this.generalArgs[0], this.generalArgs[1]);
if (newCommit === undefined) {
// its just a fast forwrard
animationFactory.refreshTree(this.animationQueue);
return;
}
animationFactory.genCommitBirthAnimation(this.animationQueue, newCommit); animationFactory.genCommitBirthAnimation(this.animationQueue, newCommit);
}; };