1
1
mirror of https://github.com/kahole/edamagit.git synced 2024-09-11 07:15:31 +03:00

Compare commits

...

2 Commits

Author SHA1 Message Date
Kristian Andersen Hole
153a2dcfe0 changelog 2022-08-15 22:00:18 +02:00
Kristian Andersen Hole
7cb20a7350 swap and rename stash work tree / index flags (#218) 2022-08-15 21:58:47 +02:00
4 changed files with 7 additions and 4 deletions

View File

@ -1,5 +1,8 @@
# Changelog
## [0.6.31] - 2022-07-30
- Rename, and swap, `i` and `w` stash actions to match emacs-magit (#218)
## [0.6.30] - 2022-07-30
- defend against incoming breaking change in internal git extension (#217)

2
package-lock.json generated
View File

@ -1,6 +1,6 @@
{
"name": "magit",
"version": "0.6.30",
"version": "0.6.31",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

View File

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

View File

@ -11,8 +11,8 @@ const stashingMenu = {
{ label: 'p', description: 'Pop', action: popStash },
{ label: 'a', description: 'Apply', action: applyStash },
{ label: 'k', description: 'Drop', action: dropStash },
{ label: 'i', description: 'Save index', action: stashWorktree },
{ label: 'w', description: 'Save worktree', action: stashIndex },
{ label: 'i', description: 'Stash index', action: stashIndex },
{ label: 'w', description: 'Stash worktree', action: stashWorktree },
{ label: 'x', description: 'Save keeping index', action: (menuState: MenuState) => stash(menuState, ['--keep-index']) },
]
};