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

Fixes Issue #4

Browse source
This commit is contained in:
Peter Cottle 2013-02-16 13:15:38 -08:00
parent 1ad1ba24d2
commit 81c1d2402a
7 changed files with 24 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1208,6 +1208,12 @@ GitEngine.prototype.merge = function(targetSource, currentLocation) {
GitEngine.prototype.checkoutStarter = function() {
var args = null;
if (this.commandOptions['-b']) {
if (this.generalArgs.length) {
throw new GitError({
msg: "I don't expect general args before -b!"
});
}
// the user is really trying to just make a branch and then switch to it. so first:
args = this.commandOptions['-b'];
this.twoArgsImpliedHead(args, '-b');