From 745c10c85a55ee2dfacc2837983ff505278ea3d0 Mon Sep 17 00:00:00 2001
From: Peter Cottle <pcottle@fb.com>
Date: Sat, 16 Jun 2018 16:37:11 -0700
Subject: [PATCH] Resolves #469 bug in arg parsing

---
 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 6af5a113..c6940585 100644
--- a/src/js/git/commands.js
+++ b/src/js/git/commands.js
@@ -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(