TakeV/spacemacs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
spacemacs/layers
History
duianto b238516d1f [version-control] smerge add 2 keys, etc. 
Added key bindings:
`e` `smerge-ediff` to diff column
`K` `smerge-kill-current` to merge action column,
(used upper case K, because lower case k moves the cursor to the previous line)

Renamed "join curr/next hunk" to "Combine curr/next hunks", to match it's
command name: `smerge-combine-with-next`
and moved it from the "Merge Action" column to the "Other" column. Because the
merge action column handles versions while the combine command acts on hunks.

Sorted and groupped the backend keys to match the transient state columns.
2019-04-20 20:50:45 +02:00
..
+chat Cleanup which-key names 2019-02-18 14:35:00 -05:00
+checkers Fix typo in spell-checking layer documentation 2019-04-06 10:01:45 +02:00
+completion fix typos in spacemacs/search-dir* bindings 2019-04-05 19:07:09 +02:00
+distributions Fix typo in holy-mode 2019-04-18 23:29:48 +02:00
+emacs Add org-brain keybindings 2019-04-18 19:37:41 +02:00
+email Fix typo in mu4e documentation 2019-04-18 23:10:51 +02:00
+filetree Make sure treemacs' buffers are ignored by winum. 2019-01-20 15:44:43 +02:00
+fonts/unicode-fonts Unify packages list parentheses style 2018-11-21 21:35:38 +00:00
+frameworks Move "import-js" to own layer for js based layers 2019-04-18 21:08:43 +02:00
+fun documentation formatting: Wed Dec 5 03:03:03 UTC 2018 2018-12-04 22:06:14 -05:00
+intl Adapt for Magit's move to Transient 2019-02-16 10:21:45 -05:00
+lang [clojure] keybinding - cider-undef - remove symbol from current ns 2019-04-20 15:26:55 +02:00
+misc [ietf layer] Add RFC files to the auto-mode-alist to use irfc-mode 2019-04-13 18:59:54 +02:00
+music/spotify documentation formatting: Wed Dec 5 03:03:03 UTC 2018 2018-12-04 22:06:14 -05:00
+os Fix OSX keybindings for daemon mode 2019-04-09 22:38:47 +02:00
+pair-programming/floobits documentation formatting: Wed Dec 5 03:03:03 UTC 2018 2018-12-04 22:06:14 -05:00
+readers Add labeled prefix for dash layer 2019-04-11 23:16:45 +02:00
+source-control [version-control] smerge add 2 keys, etc. 2019-04-20 20:50:45 +02:00
+spacemacs Exclude which-key from layer sync powerline restore 2019-04-15 10:29:59 +02:00
+tags documentation formatting: Wed Dec 5 03:03:03 UTC 2018 2018-12-04 22:06:14 -05:00
+themes documentation formatting: Wed Dec 5 03:03:03 UTC 2018 2018-12-04 22:06:14 -05:00
+tools documentation formatting: Thu Apr 18 19:16:31 UTC 2019 2019-04-18 21:39:10 +02:00
+vim documentation formatting: Wed Dec 5 03:03:03 UTC 2018 2018-12-04 22:06:14 -05:00
+web-services [confluence] s/xlm/xml 2019-04-03 10:19:48 +02:00
auto-layer.el Add lazy-install to automatically install dart layer 2019-04-12 18:00:00 +02:00
LAYERS.org documentation formatting: Thu Apr 18 19:16:31 UTC 2019 2019-04-18 21:39:10 +02:00