From 9cbffaf841b3d38a5c365bcfd358adc9d413fe18 Mon Sep 17 00:00:00 2001 From: Ryan Yin Date: Thu, 18 Jan 2024 16:26:41 +0800 Subject: [PATCH] docs: emacs - magit --- home/base/desktop/editors/emacs/README.md | 33 ++++++++++------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/home/base/desktop/editors/emacs/README.md b/home/base/desktop/editors/emacs/README.md index 90fcfc68..b5554aab 100644 --- a/home/base/desktop/editors/emacs/README.md +++ b/home/base/desktop/editors/emacs/README.md @@ -198,25 +198,20 @@ Magit is a powerful tool that make git operations easy and intuitive. Shortcuts in magit's pane: -<<<<<<< HEAD -======= > When run `git commit` / `git add` / `git push` /... via magit, multiple Arguments can be set. > Set arguments won't trigger a git command immediately. Magit will try to run a git command only after an Action key is pressed. ->>>>>>> d61e580 (docs: emacs - magit) -| Action | Shortcut | -| -------------------------------------------------- | --------- | -| Quit the current Magit pane | `q` | -| Commit | `c` | -| Stage | `s` | -| Unstage | `u` | -| Push | `p` | -| Pull | `f` | -| Rebase | `r` | -| Merge | `m` | -| Fold/Unfold | `TAB` | -| Show details of the current unit(commit/stage/...) | `` | -<<<<<<< HEAD -======= - ->>>>>>> d61e580 (docs: emacs - magit) +| Action | Shortcut | +| -------------------------------------------------- | --------------------------------------------- | +| Quit the current Magit pane | `q` | +| Commit | `c` | +| Stage | `s` | +| Unstage | `u` | +| Push | `p` | +| Pull | `f` | +| Rebase | `r` | +| Rebase Interactively | `r + i`, select on a commit, then `C-c + C-c` | +| Stash | `z` | +| Merge | `m` | +| Fold/Unfold | `TAB` | +| Show details of the current unit(commit/stage/...) | `` |