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

Merge pull request #192 from ptsoccer/master

Browse source 
Fixed couple of issues where the target branch/ref was being ignored
This commit is contained in:
Peter Cottle 2014-07-22 17:27:36 +08:00
commit b9f4f6e9a1
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/js/git/commands.js
View file

@ -579,7 +579,7 @@ var commandConfig = {
var generalArgs = command.getGeneralArgs(); var generalArgs = command.getGeneralArgs();
if (commandOptions['-i']) { if (commandOptions['-i']) {
var args = commandOptions['-i']; var args = commandOptions['-i'].concat(generalArgs);
command.twoArgsImpliedHead(args, ' -i'); command.twoArgsImpliedHead(args, ' -i');
engine.rebaseInteractive( engine.rebaseInteractive(
args[0], args[0],
@ -645,7 +645,7 @@ var commandConfig = {
} }
if (commandOptions['-B']) { if (commandOptions['-B']) {
args = commandOptions['-B']; args = commandOptions['-B'].concat(generalArgs);
command.twoArgsImpliedHead(args, '-B'); command.twoArgsImpliedHead(args, '-B');
engine.forceBranch(args[0], args[1]); engine.forceBranch(args[0], args[1]);