mirror of
https://github.com/pcottle/learnGitBranching.git
synced 2025-07-09 14:14:27 +02:00
nice have left and right view also
This commit is contained in:
parent
ff809dd85f
commit
7d05c5167d
4 changed files with 13 additions and 37 deletions
|
@ -1017,7 +1017,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...'
|
||||
});
|
||||
}
|
||||
|
|
|
@ -99,7 +99,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();
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue