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

Resolves #1004 -- fix arg parsing on git pull

Browse source
This commit is contained in:
Peter Cottle 2022-08-29 16:25:51 -06:00
parent 88a6d34e91
commit ad04b2d8d8
2 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -230,6 +230,9 @@ var commandConfig = {
var commandOptions = command.getOptionsMap();
var generalArgs = command.getGeneralArgs();
if (commandOptions['--rebase']) {
generalArgs = commandOptions['--rebase'].concat(generalArgs);
}
command.twoArgsForOrigin(generalArgs);
assertOriginSpecified(generalArgs);
// here is the deal -- git pull is pretty complex with