diff options
| author | Miquel Sabaté Solà <msabate@suse.com> | 2020-04-27 14:31:32 +0200 |
|---|---|---|
| committer | Miquel Sabaté Solà <msabate@suse.com> | 2020-04-27 14:31:32 +0200 |
| commit | 22f7cfc806c9a47b3bde69e6c12da97f88e7c525 (patch) | |
| tree | e463add5cee38d588a3eeaa771dea614514cf225 /.emacs.d/init.org | |
| parent | b58bfcced96c9408cc5f92f37f488ae01199433b (diff) | |
| download | dotfiles-22f7cfc806c9a47b3bde69e6c12da97f88e7c525.tar.gz dotfiles-22f7cfc806c9a47b3bde69e6c12da97f88e7c525.zip | |
emacs: turns out that magit can indeed stage by patches
Before knowing this I had to resort to the CLI and manually `git stash -p` all
the way. Turns out that magit is actually able to stage particular changes from
a specific files, so this whole workflow is no longer needed, and hence the
warning on the documentation is no longer valid.
Signed-off-by: Miquel Sabaté Solà <msabate@suse.com>
Diffstat (limited to '.emacs.d/init.org')
| -rw-r--r-- | .emacs.d/init.org | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.emacs.d/init.org b/.emacs.d/init.org index 243dfea..4aeb045 100644 --- a/.emacs.d/init.org +++ b/.emacs.d/init.org @@ -1135,7 +1135,7 @@ into Evil: @@html:<kbd>C-c +</kbd>@@ for increasing a number, and * Git -[[https://magit.vc/][Magit]] is a git porcelain inside GNU Emacs. I've grown really fond of it, since it makes some git operations dead easier and faster to perform (e.g. rebasing). Moreover, some other commands are way prettier and more useful with Magit (e.g. the =log= command, staging, showing diffs, etc). So right now my situation is that I use Magit most of the time, and bare git when I want to do something fishy or very specific (e.g. =git stash -p=). Some notes on this setup: +[[https://magit.vc/][Magit]] is a git porcelain inside GNU Emacs. I've grown really fond of it, since it makes some git operations dead easier and faster to perform (e.g. rebasing). Moreover, some other commands are way prettier and more useful with Magit (e.g. the =log= command, staging, showing diffs, etc). So right now my situation is that I use Magit most of the time, and bare git when I want to do something fishy. Some notes on this setup: 1. I set @@html:<kbd>C-x g</kbd>@@ as a binding for =magit-status= and @@html:<kbd>C-c l</kbd>@@ as a binding for =magit-log-buffer-file=. These are the most useful =magit= entries. 2. I install =evil-magit=, which could've been replaced by =evil-collection= but it really falls short. Thus, I keep this package and insist on my bindings around moving through windows. |