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

damn! all of git rebasing interactive barebones almost done

Browse source
This commit is contained in:
Peter Cottle 2012-10-23 22:05:12 -07:00
parent a5da6f76b8
commit 41d72793ea
5 changed files with 320 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/git.js
View file

@ -864,11 +864,8 @@ GitEngine.prototype.rebaseInteractive = function(targetSource, currentLocation)
});
}
console.log(toRebase);
// now do stuff :D since all our validation checks have passed, we are going to defer animation
// and actually launch the dialog
this.animationQueue.set('defer', true);
var callback = _.bind(function(userSpecifiedRebase) {
@ -879,9 +876,11 @@ GitEngine.prototype.rebaseInteractive = function(targetSource, currentLocation)
this.animationQueue.start();
}, this);
setTimeout(function() {
callback(toRebase);
}, 2000);
new InteractiveRebaseView({
callback: callback,
toRebase: toRebase,
el: $('#dialogHolder')
});
};
GitEngine.prototype.rebaseFinish = function(toRebaseRough, stopSet, targetSource, currentLocation) {