kahole/edamagit
1
1
Fork 0
mirror of https://github.com/kahole/edamagit.git synced 2024-09-11 07:15:31 +03:00
Code Issues Projects Releases Wiki Activity

fixup! adds no verify to merge commit

Browse Source
This commit is contained in:
Kristian Andersen Hole 2024-01-23 14:03:55 +01:00
parent 7c9edfecd1
commit b968cfda62
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package-lock.json generated
View File

@ -1,12 +1,12 @@
{ {
"name": "magit", "name": "magit",
"version": "0.6.57", "version": "0.6.59",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "magit", "name": "magit",
"version": "0.6.57", "version": "0.6.59",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@vscode/iconv-lite-umd": "^0.7.0", "@vscode/iconv-lite-umd": "^0.7.0",

2
package.json
View File

@ -7,7 +7,7 @@
"author": { "author": {
"name": "Kristian Andersen Hole" "name": "Kristian Andersen Hole"
}, },
"version": "0.6.57", "version": "0.6.59",
"engines": { "engines": {
"vscode": "^1.50.0" "vscode": "^1.50.0"
}, },

6
src/commands/mergingCommands.ts
View File

@ -29,16 +29,16 @@ export async function merging(repository: MagitRepository) {
const switches = [ const switches = [
{ key: '-f', name: '--ff-only', description: 'Fast-forward only' }, { key: '-f', name: '--ff-only', description: 'Fast-forward only' },
{ key: '-n', name: '--no-ff', description: 'No fast-forward' }, { 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 = [ const whileMergingSwitches = [
{ key: '-n', name: '--no-verify', description: 'Disable hooks' }, { key: '-n', name: '--no-verify', description: 'Disable hooks' },
]; ];
if (repository.mergingState) { if (repository.mergingState) {
return MenuUtil.showMenu(whileMergingMenu, { repository, switches }); return MenuUtil.showMenu(whileMergingMenu, { repository, switches: whileMergingSwitches });
} else { } else {
return MenuUtil.showMenu(mergingMenu, { repository, switches: whileMergingSwitches }); return MenuUtil.showMenu(mergingMenu, { repository, switches });
} }
} }