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

Resolves #184 interactive rebase upstream check

Browse source
This commit is contained in:
Peter Cottle 2014-06-30 20:50:01 -07:00
parent e78bf0cdfe
commit ecd848625b
1 changed files with 0 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2075,13 +2075,6 @@ GitEngine.prototype.rebaseInteractive = function(targetSource, currentLocation,
// there are a reduced set of checks now, so we can't exactly use parts of the rebase function // there are a reduced set of checks now, so we can't exactly use parts of the rebase function
// but it will look similar. // but it will look similar.
// first if we are upstream of the target
if (this.isUpstreamOf(targetSource, currentLocation)) {
throw new GitError({
msg: intl.str('git-result-nothing')
});
}
// now get the stop set // now get the stop set
var stopSet = Graph.getUpstreamSet(this, targetSource); var stopSet = Graph.getUpstreamSet(this, targetSource);