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

real pull --rebase fixed

Browse source
This commit is contained in:
Peter Cottle 2013-06-11 20:52:34 -07:00
parent bbfb4d7512
commit aed8ce29f3
5 changed files with 1 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/js/git/index.js
View file

@ -1033,13 +1033,6 @@ GitEngine.prototype.pullFinishWithRebase = function(
return this.rebase(remoteBranch, localBranch, pendingFetch);
}, this));
chain = chain.then(_.bind(function() {
// HAX
var localCommit = localBranch.get('target');
this.setTargetLocation(this.refs['o/master'], localCommit);
return AnimationFactory.playRefreshAnimation(this.gitVisuals);
}, this));
this.animationQueue.thenFinish(chain, deferred);
};