From 30a50cf4c027a5c75a7a1e07d66d18956dc29cf9 Mon Sep 17 00:00:00 2001 From: Cesar Costas Date: Wed, 30 Nov 2022 02:35:44 +0000 Subject: [PATCH] Manually add arguments after squash to the general arguments --- src/js/git/commands.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/git/commands.js b/src/js/git/commands.js index c22225a7..49e3675c 100644 --- a/src/js/git/commands.js +++ b/src/js/git/commands.js @@ -564,7 +564,7 @@ var commandConfig = { ], execute: function(engine, command) { 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); var newCommit = engine.merge(