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

nice have left and right view also

Browse source
This commit is contained in:
Peter Cottle 2012-12-20 12:16:40 -08:00
parent ff809dd85f
commit 7d05c5167d
4 changed files with 13 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

12
build/bundle.js
View file

@ -5632,7 +5632,7 @@ GitEngine.prototype.rebaseInteractive = function(targetSource, currentLocation)
.then(_.bind(function(userSpecifiedRebase) {
// first, they might have dropped everything (annoying)
if (!userSpecifiedRebase.length) {
throw new GitError({
throw new CommandResult({
msg: 'Nothing to do...'
});
}
@ -8534,7 +8534,9 @@ var InteractiveRebaseView = ContainedBase.extend({
this.confirm();
}, this))
.fail(_.bind(function() {
this.deferred.reject();
// empty array does nothing, just like in git
this.hide();
this.deferred.resolve([]);
}, this))
.done();
@ -12650,7 +12652,7 @@ GitEngine.prototype.rebaseInteractive = function(targetSource, currentLocation)
.then(_.bind(function(userSpecifiedRebase) {
// first, they might have dropped everything (annoying)
if (!userSpecifiedRebase.length) {
throw new GitError({
throw new CommandResult({
msg: 'Nothing to do...'
});
}
@ -14920,7 +14922,9 @@ var InteractiveRebaseView = ContainedBase.extend({
this.confirm();
}, this))
.fail(_.bind(function() {
this.deferred.reject();
// empty array does nothing, just like in git
this.hide();
this.deferred.resolve([]);
}, this))
.done();