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

Resolves #469 bug in arg parsing

Browse source
This commit is contained in:
Peter Cottle 2018-06-16 16:37:11 -07:00
parent 9af3220152
commit 745c10c85a
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/commands.js
View file

@ -549,7 +549,7 @@ var commandConfig = {
],
execute: function(engine, command) {
var commandOptions = command.getOptionsMap();
var generalArgs = command.getGeneralArgs();
var generalArgs = command.getGeneralArgs().concat(commandOptions['--no-ff'] || []);
command.validateArgBounds(generalArgs, 1, 1);
var newCommit = engine.merge(