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

Manually add arguments after squash to the general arguments

Browse source
This commit is contained in:
Cesar Costas 2022-11-30 02:35:44 +00:00 • committed by GitHub
parent e7fcf25566
commit 30a50cf4c0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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

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