diff --git a/src/js/git/commands.js b/src/js/git/commands.js
index 50406209..c22225a7 100644
--- a/src/js/git/commands.js
+++ b/src/js/git/commands.js
@@ -559,7 +559,8 @@ var commandConfig = {
   merge: {
     regex: /^git +merge($|\s)/,
     options: [
-      '--no-ff'
+      '--no-ff',
+      '--squash'
     ],
     execute: function(engine, command) {
       var commandOptions = command.getOptionsMap();
@@ -568,7 +569,10 @@ var commandConfig = {
 
       var newCommit = engine.merge(
         generalArgs[0],
-        { noFF: !!commandOptions['--no-ff'] }
+        {
+          noFF: !!commandOptions['--no-ff'],
+          squash: !!commandOptions['--squash']
+        }
       );
 
       if (newCommit === undefined) {