fixup! adds no verify to merge commit

kahole · Jan 23, 2024 · b968cfd · b968cfd
1 parent 7c9edfe
commit b968cfd
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -7,7 +7,7 @@
   "author": {
     "name": "Kristian Andersen Hole"
   },
-  "version": "0.6.57",
+  "version": "0.6.59",
   "engines": {
     "vscode": "^1.50.0"
   },

diff --git a/src/commands/mergingCommands.ts b/src/commands/mergingCommands.ts
@@ -29,16 +29,16 @@ export async function merging(repository: MagitRepository) {
   const switches = [
     { key: '-f', name: '--ff-only', description: 'Fast-forward only' },
     { key: '-n', name: '--no-ff', description: 'No fast-forward' },
-    { key: '-n', name: '--no-verify', description: 'Disable hooks' },
+    { key: '-v', name: '--no-verify', description: 'Disable hooks' },
   ];
   const whileMergingSwitches = [
     { key: '-n', name: '--no-verify', description: 'Disable hooks' },
   ];
 
   if (repository.mergingState) {
-    return MenuUtil.showMenu(whileMergingMenu, { repository, switches });
+    return MenuUtil.showMenu(whileMergingMenu, { repository, switches: whileMergingSwitches });
   } else {
-    return MenuUtil.showMenu(mergingMenu, { repository, switches: whileMergingSwitches });
+    return MenuUtil.showMenu(mergingMenu, { repository, switches });
   }
 }