mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-06-25 23:48:34 +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

14
build/bundle.js
View file

@ -8076,13 +8076,6 @@ GitEngine.prototype.pullFinishWithRebase = function(
return this.rebase(remoteBranch, localBranch, pendingFetch); return this.rebase(remoteBranch, localBranch, pendingFetch);
}, this)); }, 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); this.animationQueue.thenFinish(chain, deferred);
}; };
@ -24216,13 +24209,6 @@ GitEngine.prototype.pullFinishWithRebase = function(
return this.rebase(remoteBranch, localBranch, pendingFetch); return this.rebase(remoteBranch, localBranch, pendingFetch);
}, this)); }, 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); this.animationQueue.thenFinish(chain, deferred);
}; };

1
build/bundle.min.4253d356.js
View file

File diff suppressed because one or more lines are too long

1
build/bundle.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
index.html
View file

@ -426,7 +426,7 @@
For a much easier time perusing the source, see the individual files at: For a much easier time perusing the source, see the individual files at:
https://github.com/pcottle/learnGitBranching https://github.com/pcottle/learnGitBranching
--> -->
<script src="build/bundle.min.4253d356.js"></script> <script src="build/bundle.js"></script>
<!-- The advantage of github pages: super-easy, simple, slick static hostic. <!-- The advantage of github pages: super-easy, simple, slick static hostic.
The downside? No raw logs to parse for analytics, so I have to include The downside? No raw logs to parse for analytics, so I have to include

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

@ -1033,13 +1033,6 @@ GitEngine.prototype.pullFinishWithRebase = function(
return this.rebase(remoteBranch, localBranch, pendingFetch); return this.rebase(remoteBranch, localBranch, pendingFetch);
}, this)); }, 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); this.animationQueue.thenFinish(chain, deferred);
}; };