mirror of
https://github.com/kahole/edamagit.git
synced 2024-09-11 07:15:31 +03:00
adds no verify to merge commit
This commit is contained in:
parent
cc51974ce9
commit
63c1ea1cd5
@ -31,11 +31,14 @@ export async function merging(repository: MagitRepository) {
|
|||||||
{ 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: '-n', name: '--no-verify', description: 'Disable hooks' },
|
||||||
];
|
];
|
||||||
|
const whileMergingSwitches = [
|
||||||
|
{ key: '-n', name: '--no-verify', description: 'Disable hooks' },
|
||||||
|
];
|
||||||
|
|
||||||
if (repository.mergingState) {
|
if (repository.mergingState) {
|
||||||
return MenuUtil.showMenu(whileMergingMenu, { repository });
|
return MenuUtil.showMenu(whileMergingMenu, { repository, switches });
|
||||||
} else {
|
} else {
|
||||||
return MenuUtil.showMenu(mergingMenu, { repository, switches });
|
return MenuUtil.showMenu(mergingMenu, { repository, switches: whileMergingSwitches });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -117,4 +120,4 @@ async function abortMerge({ repository }: MenuState) {
|
|||||||
const args = ['merge', '--abort'];
|
const args = ['merge', '--abort'];
|
||||||
return gitRun(repository.gitRepository, args);
|
return gitRun(repository.gitRepository, args);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user