Commit graph

90 commits

Author SHA1 Message Date
dubnde 2febbbb309 Remove git layer documentation to show submodule prompt
There is no such keybinding(SPC g >) in the source code.
2017-05-24 12:30:14 +02:00
duianto 116c51520e Add a key binding for magit-find-file
problem:  currently, viewing a file at a specific branch/commit, requires one to
          type the magit-find-file command, at the M-x prompt
solution: SPC g f f is available and consistent with the SPC f f key binding
2017-05-18 18:40:34 +02:00
duianto 1ded2f56be Update git doc magit-clone and magit-init 2017-05-18 18:33:33 +02:00
Steven Allen 6c0c4dcf37 Add keybindings for magit clone and init. 2017-05-14 22:04:02 -04:00
JAremko c1e4556882 Format and cleanup docs. Fix links. 2017-04-28 23:29:14 -04:00
jc00ke 5d4875b425 Magit: Fix decrease hunk key in README 2017-04-17 21:51:51 -04:00
Robert O'Connor e9ff9f09c6 Remove trailing whitespace from all files 2017-03-26 13:06:43 -04:00
syl20bnr fb27ede558 Bump year in copyright headers
Happy New Year 2017!
2017-01-05 23:08:17 -05:00
Justin Burkett 7bf00ad878 which-key: Update usage of replacement alists
See 19186917eb
2016-11-25 12:32:10 +02:00
zhexuany 19592f0ad5 fixed syntax highloght in README 2016-11-22 20:41:45 -05:00
Justin Humm 7172cd7170 Fixed dead hyperlink in magit intro 2016-11-20 18:53:31 -05:00
Muneeb Shaikh 5771484668 Move spacemacs/git-link-* functions to git layer 2016-10-17 18:52:55 +05:30
Eoin Houlihan 7464ef32e2 Use Magit 2.8's built-in fullscreen display function 2016-10-17 14:11:28 +02:00
Ryan Phillips cd6b5ed67b add magit-repolist support
fixes #7083
2016-10-17 14:07:58 +02:00
bmag 88e4ddf778 git: hook fci-mode only when fci package is used 2016-10-17 13:42:37 +02:00
Eivind Fonn 25eb00c24f Update git layer rebase documentation 2016-08-19 10:10:09 +02:00
syl20bnr 0a01159572 git: add SPC g f h to get the commit history of the current file 2016-07-28 23:26:54 -04:00
syl20bnr 140e779735 git: add SPC g l prefix command name 2016-07-05 00:23:16 -04:00
syl20bnr 316dc0765d git: move git-link to git layer under SPC g l command prefix
git-link is aimed to work with various git hosting services so it makes
sense to move it back to git layer.
2016-07-05 00:23:16 -04:00
syl20bnr b92daec7cf git: remove all popup key binding for magit-dispatch-popup
The `SPC g` command prefix was to much overloaded for actions which
are already available in discoverable manner in magit. So I decided to
remove all the actions reachable from magit-dispatch-popup from `SPC g`.
magit-dispatch-popup is available under `SPC g m`. This increases the
key binding sequences but OTHO it makes everythings consistent (same
key sequence behind `SPC g s` and `SPC g m`) and we prefer consistency.

This refactoring free up a lot of precious key bindings we can use for
commands that are not available in Magit.
2016-07-05 00:23:16 -04:00
syl20bnr a2de9a63af Use :toggle keyword instead of when forms 2016-05-29 22:39:21 -04:00
syl20bnr 1f993bddf6 Rename spacemacs-helm and spacemacs-ivy layers to helm and ivy
For ivy users: be sure to update your dotfile by replacing spacemacs-ivy
by ivy
2016-05-15 22:24:27 -04:00
Robert O'Connor 55ebd1e679 git: add submodule popup keybinding 2016-05-06 13:04:06 +02:00
syl20bnr 07852abad5 Format documenation files with doc-fmt tool 2016-04-12 23:31:38 -04:00
Magnus Therning 5c575a7eb8 git: Add binding to magit-reset-popup
Signed-off-by: Magnus Therning <magnus@therning.org>
2016-04-08 17:43:35 +02:00
syl20bnr 3b0c1fd93d Convert org doc files with doc-fmt 2016-03-30 22:59:55 -04:00
syl20bnr 82fdd9a511 Use evil in holy-mode
Motivation

While disabling Evil in holy-mode makes its implementation shorter and
sounds elegant on the paper, in practice it puts a big burden on the
configuration parts which need to know if Evil is enable or not. This is
a bad separation of concerns and the bunch of fixes that we were forced
to do in the past weeks shows this issue. Those fixes were about
removing the knowledge of the activation of Evil by implementing new
dispatching functions to be used by layers, this is cumbersome and makes
Spacemacs layer configuration more subtle which is not good. There was
additional bad consequences of the removal of Evil state like the
impossibility to use Evil lisp state or iedit states, or we would have
been forced to implement a temporary activation of Evil which is
awkward.

Instead I reintroduce Evil as the central piece of Spacemacs design thus
Evil is now re-enabled in holy-mode. It provides the abstraction we need
to isolate editing styles and be able to grow the Spacemacs
configuration coverage sanely. Layers don't need to check whether the
holy mode is active or not and they don't need to know if Evil is
available (it is always available). We also don't need to write
additional dispatching functions, this is the job of Evil, and I think
it provides everything for this. Ideally configuration layer should be
implemented with only Evil in mind and the holy-mode (and hybrid-mode)
should magically make it work for Emacs style users, for instance we can
freely use `evil-insert-state` anywhere in the code without any guard.

Evil is now even more part of Spacemacs, we can really say that
Spacemacs is Emacs+Evil which is now an indivisible pair. Spacemacs
needed this stable API to continue on the right track.

While these changes should be rather transparent to the user, I'm sorry
for this experimental period, I failed to see all the implications of
such a change, I was just excited about the possibility to make Evil
optional. The reality is that Spacemacs has to embrace it and keep its
strong position on being Emacs+Evil at the core.

Implementation

- insert, motion and normal states are forced to emacs state using an
advice on `evil-insert-state`, `evil-motion-state` and
`evil-normal-state` respectively. These functions can be used freely in
the layer configuration.
- A new general hook `spacemacs-editing-style-hook` allow to hook any
code that need to be configured based on the editing style. Functions
hooked to this hook takes the current style as parameter, this
basically generalize the hook used to setup hjkl navigation bindings.
- ESC has been removed from the emacs state map.
- Revert unneeded changes
  - Revert "evil: enter insert-state only from normal-state"
    commit bdd702dfbe.
  - Revert "avoid being evil in deft with emacs editing style"
    commit f3a16f49ed.

Additional changes

All editing style packages have been moved to a layer called
`spacemacs-editing-styles`

Notes

I did not have time to attack hybrid mode, I should be able to do it
later.
2016-03-13 21:16:55 -04:00
Muneeb Shaikh f903460994 source-control: git-timemachine goto nth revision
Allows you to goto arbitrary revision by inputting rev number. e.g. To
goto 1st revision of the file, enter 1.
2016-03-12 17:51:50 +01:00
Johan K. Jensen be2c471397 Fix inline code blocks
Add zero-width space because emphasis blocks can't start/end with
a comma, an apostrophe or a quote.
2016-03-01 18:51:13 +01:00
Balaji Sivaraman 2b1ed603dc Change all references of micro-state in codebase to transient-state 2016-01-31 23:04:47 -05:00
syl20bnr de44ab15ba git: revert git blame transient state to micro state
To work this transient state needs to support a function as a
`:exit` value.
2016-01-26 01:21:01 -05:00
justbur d2582fceec transient-state: Improve some docs 2016-01-26 01:21:01 -05:00
justbur e97af03ff7 Call new micro-state a transient state 2016-01-26 01:21:00 -05:00
justbur 7b819fff5e git: Translate time-machine and git-blame micro-states 2016-01-26 01:20:59 -05:00
Robert O'Connor c0e0702430 bind SPC gA to magit-cherry-pick-popup 2016-01-23 17:15:02 +01:00
Robert O'Connor f86ec0e047 add magit-rebase-popup command to init function 2016-01-23 17:13:00 +01:00
Fabien Dubosson 9ab4ddb3b5 Correct alignment in git's layer README 2016-01-21 21:53:52 +01:00
Christoph Neuroth 1d76daeef7 Bind SPC g r to magit-rebase-popup 2016-01-21 21:53:52 +01:00
syl20bnr 046d86800c Clean copyrights and update for year 2016 2016-01-11 21:42:17 -05:00
justbur b0ee301845 layers: Conditionally load helm packages
Only use them when the spacemacs-helm layer is used.
2016-01-09 13:36:03 -05:00
syl20bnr cddf18ff1e Update install layer section in REAMDE.org files 2016-01-06 00:21:55 -05:00
Robert O'Connor 7dcbde1a95 Add push to matching branch to git layer README 2016-01-03 23:57:17 -05:00
scloudyy ef5bea1207 Fix push/pull keybindings in git README 2016-01-03 14:17:45 +01:00
Fabien Dubosson 374e37e32c Add information about global-git-commit-mode
Fix #2522
2015-12-21 13:56:38 +01:00
justbur 0b02475772 Use built-in evil functions to set default states
evil-set-initial-state is safer than manually adding and deleting from
the lists, because it knows about all available states and ensures that
the mode only shows up in one list. If it is in multiple list the
initial state depends on which is checked first, which we don't want.
2015-12-21 00:22:18 -05:00
syl20bnr e3a816b37d org: move orgit to git layer and add documenation 2015-12-20 01:02:12 -05:00
dptd 0144b39a3b removed unnecessary white char 2015-12-12 23:02:53 -05:00
syl20bnr 086c11af2c git: add SPC m a for with-editor-cancel 2015-12-09 00:53:33 -05:00
justbur 01b9b29d0b with-editor: Update keys for c-c c-c convention
Add `,,` for finish and use `,k` for cancel instead of `,a`.
2015-12-09 00:52:50 -05:00
syl20bnr 410d3d9572 git: add gr and GR bindings to evilfiied magit buffers
since magit uses keymap text properties we need to explicitly define
them in each section keymap. Could be refactored a bit.
2015-12-08 02:10:06 -05:00