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

Issue #179 consolidate rebase -i and rebase codepaths

Browse source
This commit is contained in:
Peter Cottle 2014-06-29 15:57:44 -07:00
parent a04ae67c0e
commit d01f1806b4
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2076,7 +2076,7 @@ GitEngine.prototype.rebaseInteractive = function(targetSource, currentLocation,
// but it will look similar. // but it will look similar.
// first if we are upstream of the target // first if we are upstream of the target
if (this.isUpstreamOf(currentLocation, targetSource)) { if (this.isUpstreamOf(targetSource, currentLocation)) {
throw new GitError({ throw new GitError({
msg: intl.str('git-result-nothing') msg: intl.str('git-result-nothing')
}); });