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

BOOM two new awesome levels before rebase 9000

Browse source
This commit is contained in:
Peter Cottle 2013-07-28 18:19:15 -07:00
parent 542d68a975
commit d4d7fb21c7
11 changed files with 612 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1397,7 +1397,8 @@ GitEngine.prototype.rebase = function(targetSource, currentLocation, options) {
return this.rebaseFinish(toRebaseRough, stopSet, targetSource, currentLocation, options);
};
GitEngine.prototype.rebaseInteractive = function(targetSource, currentLocation) {
GitEngine.prototype.rebaseInteractive = function(targetSource, currentLocation, options) {
options = options || {};
// there are a reduced set of checks now, so we can't exactly use parts of the rebase function
// but it will look similar.
@ -1469,7 +1470,8 @@ GitEngine.prototype.rebaseInteractive = function(targetSource, currentLocation)
// interactive rebase view will reject or resolve our promise
new InteractiveRebaseView({
deferred: deferred,
toRebase: toRebase
toRebase: toRebase,
aboveAll: options.aboveAll
});
};