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

always check out branch on rebase

Browse source
This commit is contained in:
Peter Cottle 2012-10-22 09:10:03 -07:00
parent 7e04853a77
commit bebe06baa4
1 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/git.js
View file

@ -735,11 +735,9 @@ GitEngine.prototype.rebaseStarter = function() {
}; };
GitEngine.prototype.rebase = function(targetSource, currentLocation) { GitEngine.prototype.rebase = function(targetSource, currentLocation) {
// git for some reason always checks out the branch you are rebasing if // git for some reason always checks out the branch you are rebasing,
// you aren't in detached head // no matter the result of the rebase
if (!this.getDetachedHead()) { this.checkout(currentLocation);
this.checkout(currentLocation);
}
var targetObj = this.resolveID(targetSource); var targetObj = this.resolveID(targetSource);