1
1
mirror of https://github.com/kahole/edamagit.git synced 2024-09-11 07:15:31 +03:00
Magit for VSCode
Go to file
2020-05-08 21:44:44 +02:00
.vscode whitespace 2020-05-08 21:44:44 +02:00
images adds logo and package meta data 2020-02-19 23:14:13 +01:00
languages adds foldingrangeprovider 2019-12-10 23:55:49 +01:00
src replaces reduces with simpler joins 2020-05-05 14:39:17 +02:00
syntaxes unpulled/unpushed from/to pushRemote in statusView 2020-03-25 23:31:32 +01:00
.eslintrc.json adds stash worktree command 2020-03-27 17:11:37 +01:00
.gitignore adds webpack to bundle extension 2020-05-06 19:37:34 +02:00
.vscodeignore adds webpack to bundle extension 2020-05-06 19:37:34 +02:00
CHANGELOG.md changelog 2020-05-03 18:36:48 +02:00
LICENSE add license 2020-02-17 21:51:55 +01:00
package-lock.json adds webpack to bundle extension 2020-05-06 19:37:34 +02:00
package.json adds webpack to bundle extension 2020-05-06 19:37:34 +02:00
README.md fix collapsible 2020-05-03 18:45:50 +02:00
tsconfig.json inital chaos 2019-12-02 22:50:08 +01:00
webpack.config.js adds webpack to bundle extension 2020-05-06 19:37:34 +02:00


Magit for VSCode

vsmarketbadge

Inspired by the awesome original, Magit for Emacs

Alpha: use at own your own risk!

Usage (Theme: Dracula)

Table of Contents

Usage

VSCode Command Default shortcut
Magit Status alt+x g
Magit File Popup alt+x alt+g
Magit Dispatch alt+x ctrl+g
Help (when in magit) ?

> Magit in VSCode Command palette will show you all available Magit actions from where you are.

Keybindings inside Magit

Popup commands
  A Cherry-picking    b Branching         c Committing
  d Diffing           f Fetching          F Pulling
  i Ignoring          l Logging           m Merging
  M Remoting          P Pushing           r Rebasing
  t Tagging           V Reverting         X Resetting
  y Show Refs         z Stashing          ! Running           % Worktree
 
Applying changes
  a Apply          s Stage          u Unstage
  v Reverse        S Stage all      U Unstage all
  k Discard
  
Essential commands
  g     refresh current buffer
  TAB   toggle section at point
  RET   visit thing at point
  $     show git process view

Troubleshooting

I can't commit

  1. git config needs to be set, for repo or global
    user.name and user.email

  2. code needs to be in your path
    (Doesn't apply to OS X)
    Adding VSCode to path

Vim support (VSCodeVim)

Add these to your keybindings.json config file

keybindings.json
  {
    "key": "tab",
    "command": "extension.vim_tab",
    "when": "editorFocus && vim.active && !inDebugRepl && vim.mode != 'Insert' && !editorLangId == 'magit'"
  },
  {
    "key": "tab",
    "command": "-extension.vim_tab",
    "when": "editorFocus && vim.active && !inDebugRepl && vim.mode != 'Insert'"
  },
  {
    "key": "o",
    "command": "magit.discard-at-point",
    "when": "editorTextFocus && editorLangId == 'magit'"
  },
  {
    "key": "k",
    "command": "-magit.discard-at-point",
    "when": "editorTextFocus && editorLangId == 'magit'"
  },
  {
    "key": "n",
    "command": "magit.reverse-at-point",
    "when": "editorTextFocus && editorLangId == 'magit'"
  },
  {
    "key": "v",
    "command": "-magit.reverse-at-point",
    "when": "editorTextFocus && editorLangId == 'magit'"
  }
  {
    "key": "shift+n",
    "command": "magit.reverting",
    "when": "editorTextFocus && editorLangId == 'magit'"
  },
  {
    "key": "shift+v",
    "command": "-magit.reverting",
    "when": "editorTextFocus && editorLangId == 'magit'"
  }

Roadmap

Feature requests as well as issues are welcome

Interface

Implement missing Git/Magit features

  • Logging (a lot missing)
  • Bisecting
  • Submodules
  • Patches

Long term

  • Stable v1.0