TakeV/spacemacs
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
8814 commits 1 branch 0 tags 62 MiB
Commit graph

172 commits

Author SHA1 Message Date
Ken Wu
fb3f548fe8 Fix bugs when version-control-diff-tool = diff-hl 
The original code is confused by diff-hl-mode and diff-hl-margin-mode.
This modification fixes all typos due to the confusion.
 2016-01-23 17:21:13 +01: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
Eivind Fonn
f3815505af Add documentation for emacs-style vc binding 2015-12-07 19:49:27 +01:00
Muneeb Shaikh
e6f3835add vc: add emacs style [p]revious binding for prev-hunk 2015-12-07 19:44:27 +01:00
Eivind Fonn
b943d00ae4 Remove magit-push-always-verify documentation 
It was removed upstream: 9e4f84f631
 2015-12-07 11:23:24 +01:00
syl20bnr
4d357cf001 git: enable gravatars in magit buffers 
The default value is nil since magit 2.3.0
 2015-12-06 20:19:44 -05:00
syl20bnr
6fd2af2af3 evilified-state: support for magit remap entries in section maps 
Add :pre-bindings keyword argument used to restore explicit key binding
in section maps.
 2015-12-06 01:04:13 -05:00
Eivind Fonn
c893383fe4 Fix some documentation bugs 
- CSS links
- GIFS in published version
- Unify layer doc titles
- Change emoji layer emojis to an image
 2015-12-03 23:50:29 -05:00
ralesi
993300ce4d Fix loading of git gutter fringes. 2015-12-03 23:48:25 -05:00
Fabien Dubosson
b7eb9f52fa Fix a typo in `version-control' README 2015-12-03 13:49:09 +01:00
Eivind Fonn
87b6d3fbe9 Fix vcs microstate documentation 2015-12-01 12:45:37 +01:00
syl20bnr
22cba50ab6 git: move stage/unstage commands to SPC g S and SPC g U 2015-12-01 01:43:29 -05:00
syl20bnr
74bc25c32c git: add autoloads for popup functions 2015-12-01 01:43:01 -05:00
ralesi
3fb775877b Update git bindings. Make use of popup. 2015-12-01 01:37:48 -05:00
Eivind Fonn
1e63a4a009 Fix diminish timing of git gutter packages 2015-12-01 01:19:30 -05:00
syl20bnr
c6e625882f version-control: move SPC T D to SPC T C-d 
By convention.
 2015-11-29 23:08:38 -05:00
syl20bnr
a41308d528 version-control: convert newlines to unix format 2015-11-29 23:03:38 -05:00
syl20bnr
b843b77f32 version-control: minor changes to respect 80th column 2015-11-29 23:00:57 -05:00
ralesi
792d4471e7 VCS micro-state / Customizable diff margins 2015-11-29 22:44:18 -05:00
Chris Perkins
d99259bcd5 Add some missing which-key prefixes 2015-11-29 12:12:43 +01:00
syl20bnr
a19c0f3d24 core: remove spacemacs/set-key funcs and add a new pre-command-hook 
This pre-command-hook translates the special key to the corresponding
emacs function key. This effects only happens in terminal, this hook is
a no-op in GUI.

By doing this we attempt to bring more consistency between the GUI
and the terminal regarding TAB and RET keys.
 2015-11-28 23:11:48 -05:00
justbur
53e2c9ac27 layers: Fix leader key in some modes 
Specifically need to be concerned with modes that make their maps
overriding.

 1. dired
 2. evil-magit
 2015-11-21 18:22:51 +01:00
justbur
9befd20a1a layers: Transition to new key bindings functions 
Removes dependence on evil-leader centralizing control over the method
of key binding in core-keybindings.el
 2015-11-21 18:22:51 +01:00
Eivind Fonn
e7fbc84ff0 Remove package guards for evilified 
See discussion in #3879
 2015-11-21 11:07:14 +01:00
syl20bnr
f95422c61d git layer: remove obsolete test since the package is protected 2015-11-19 00:56:25 -05:00
syl20bnr
e3df025eff evilified-state: fix tests and rename library to evil-evilified-state 2015-11-19 00:24:27 -05:00
justbur
b294461957 evilified-state: Make into local package 2015-11-18 23:35:01 -05:00
Eivind Fonn
c3866382b2 Documentation update 
- Add #+HTML_HEAD_EXTRA options to all org files
- HTMLize published documentation via CSS
 2015-11-13 14:23:13 +01:00
justbur
951462f316 evil-magit: Update for MELPA 2015-11-09 18:44:31 +01:00
syl20bnr
96e7c8ee86 git and github: reorganize key bindings 
gd is now "diff"
gh is now "github"
gg is not changed for "github gist" (updated the prefix name)
Inverts gc and gC since commit is more frequent than checkout
 2015-11-02 00:16:13 -05:00
Christoph Paulik
9bcd40b7b0 Add github-clone to github layer 
- allows cloning and forking from within emacs
 2015-11-01 23:44:18 -05:00
Eivind Fonn
13c5b1d24b Convert documentation to publishable format 2015-11-01 23:40:29 -05:00
Pierre Radermecker
5831b841ee Add magit-checkout binding 
This is particularly useful to switch from one branch to another without
going through the status buffer for instance.
 2015-10-31 14:07:00 +01:00
Bar Magal
16611a53d8 Update code to show magit buffers in full screen 2015-10-31 13:50:43 +01:00
justbur
01d1231ac9 git: Don't use evil-magit for emacs editing style 2015-10-29 12:22:10 -04:00
justbur
49c1f76939 git: Update git readme for evil-magit 2015-10-29 12:22:02 -04:00
justbur
150e38e76c git: Add new evil-magit bindings 
Also turn off evilification for magit conditional on the evil-magit
package being used.
 2015-10-29 09:17:44 -04:00
Robert O'Connor
f60f96ca38 git: Update docs for magit-gitflow 2015-10-25 10:41:38 +01:00
syl20bnr
f7139a4167 git: add doc for SPC g i 2015-10-22 21:43:05 -04:00
Diego Berrocal
d516553634 Add magit-init to keybindings 
I noticed that magit-init is a faster way of initializing vcs maintained
projects.
 2015-10-22 21:41:28 -04:00
Muneeb Shaikh
f4fc2a7781 Fix magit-gh-pulls and magit-gitflow keys 
Remap gh-pulls on `#` and gitflow on `%`

This breaks the old keybindings of `magit-gitflow` which was `#f`
previously.
 2015-10-22 18:16:44 -04:00
syl20bnr
2b038b2046 git: move gh-pulls bindings from #g to # 
`#` is now the official binding for gh-pulls
Resolves #3481
 2015-10-21 16:58:39 -04:00
syl20bnr
55bc0815c8 git: make git-timemachine enter function idempotent 
And make it possible to deactivate the micro-state on a different
buffer than the git-timemachine buffer
 2015-10-19 21:21:31 -04:00
syl20bnr
3e5acbea80 git: better exit function for magit-blame micro-state 2015-10-19 21:21:01 -04:00
syl20bnr
7107ea5ffa git: make SPC g b (magit-blame) idempotent 
Fixes #3467
 2015-10-19 21:10:25 -04:00
syl20bnr
0108329f5b git: simplify the git-timemachine micro-state on enter action 2015-10-18 23:39:07 -04:00
syl20bnr
bf7d9a40b4 git: new magit-blame micro state 2015-10-18 23:37:50 -04:00
Adam Olsen
a90df74e1b Bind SPC g B to 'magit-blame-quit 2015-10-18 22:36:07 -04:00
justbur
bfd360440f doc: Be consistent with ref to Spacemacs 
Use of =Spacemacs= vs Spacemacs is inconsistent. This picks Spacemacs as
a convention
 2015-10-14 00:32:09 -04:00
person808
c1b6293268 Replace eval-after-load with with-eval-after-load. 
We now backport the macro for 24.3 so we can use it everywhere.
 2015-10-07 15:51:39 -04:00
Diego Berrocal
33cd5097ff Fix typo with ~= in the doc 2015-10-07 15:51:39 -04:00
Eivind Fonn
8d1c7c8c20 Document v/V discrepancy in magit 
Fix #2476

[ci-skip]
 2015-10-05 12:07:45 +02:00
Eivind Fonn
31ec9091cc Document magit update key 
Fix #2826

[ci-skip]
 2015-10-05 12:07:45 +02:00
Carl Lange
8b6517a9be Fix a typo, githib->github 2015-09-29 21:36:55 -04:00
syl20bnr
383b1bec20 Update dotspacemacs/config and dotspacemacs/init occurrences 2015-09-28 02:05:18 -04:00
Muneeb Shaikh
1fc73d671f Evilify magit-stash-mode 2015-09-19 18:44:32 -04:00
justbur
6eab954afe Use + instead of ! for layer categories 
Helm seems to treat "!" specially in pattern matching, so having a ! in
the pattern string when traversing directories is problematic. This
change fixes #2737, because as far as I can tell "+" has no special
meaning in a helm pattern.

Of course, we can choose a different character, but I'm fond of "+" as
representing "more layers here".
 2015-09-11 00:13:51 -04:00