mirror of
https://github.com/kahole/edamagit.git
synced 2024-09-11 07:15:31 +03:00
Compare commits
3 Commits
cc51974ce9
...
b968cfda62
Author | SHA1 | Date | |
---|---|---|---|
|
b968cfda62 | ||
|
7c9edfecd1 | ||
|
63c1ea1cd5 |
4
package-lock.json
generated
4
package-lock.json
generated
@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "magit",
|
"name": "magit",
|
||||||
"version": "0.6.56",
|
"version": "0.6.59",
|
||||||
"lockfileVersion": 2,
|
"lockfileVersion": 2,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "magit",
|
"name": "magit",
|
||||||
"version": "0.6.56",
|
"version": "0.6.59",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@vscode/iconv-lite-umd": "^0.7.0",
|
"@vscode/iconv-lite-umd": "^0.7.0",
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
"author": {
|
"author": {
|
||||||
"name": "Kristian Andersen Hole"
|
"name": "Kristian Andersen Hole"
|
||||||
},
|
},
|
||||||
"version": "0.6.56",
|
"version": "0.6.59",
|
||||||
"engines": {
|
"engines": {
|
||||||
"vscode": "^1.50.0"
|
"vscode": "^1.50.0"
|
||||||
},
|
},
|
||||||
|
@ -29,11 +29,14 @@ 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: '-v', name: '--no-verify', description: 'Disable hooks' },
|
||||||
|
];
|
||||||
|
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 });
|
return MenuUtil.showMenu(whileMergingMenu, { repository, switches: whileMergingSwitches });
|
||||||
} else {
|
} else {
|
||||||
return MenuUtil.showMenu(mergingMenu, { repository, switches });
|
return MenuUtil.showMenu(mergingMenu, { repository, switches });
|
||||||
}
|
}
|
||||||
@ -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