TakeV
/
spacemacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mention breaking change for pull key binding with GitHub and forge

This commit is contained in:
syl20bnr 2019-01-17 08:59:51 -05:00
parent 01e2db9c42
commit 36c1291081
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CHANGELOG.develop
View File

@ -59,6 +59,8 @@ the [[file:CHANGELOG.org][CHANGELOG.org]] file.
(thanks to Dela Anthonio)
- Move major specific error key bindings to ~SPC m E~ prefix (thanks to Sylvain
Benner)
- For Evil style users using the GitHub layer, the key-binding to pull commits
is now on ~p~ instead of ~F~ which is taken by the new package =forge=
**** C-C++
- CMake support has been extracted from the =c-c++= layer into the new =cmake=
layer.
@ -1141,11 +1143,13 @@ Benner and Paweł Siudak):
Buliga)
**** GitHub
- Packages:
- Add new packages =forge= (thanks to Miciah Dashiel Butler Masters)
- Add package =magithub=, it is enabled by default in offline mode.
- Remove package =github-browse-file= which has been replaced by
=browse-at-remote= in =version-control= layer
- Add new packages =forge= (thanks to Miciah Dashiel Butler Masters)
- Add package =magithub=, it is enabled by default in offline mode.
- Remove package =github-browse-file= which has been replaced by
=browse-at-remote= in =version-control= layer
- Key bindings:
- For Evil style users, the key-binding to pull commits is now on ~p~ instead
of ~F~ which is taken by the new package =forge=
- Add ~g r~ evilified binding to gist-list-mode (thanks to Jean-Sebastien A.
Beaudry)
- Fix ~#~ key binding in =magit-status= for the =magit-gh-pulls= dispatch

5
layers/+source-control/git/README.org
View File

@ -159,7 +159,7 @@ Here are the often used bindings inside a =status buffer=:
| ~b b~ | checkout a branch |
| ~b c~ | create a branch |
| ~f f~ | fetch changes |
| ~F (r) u~ | pull tracked branch and rebase |
| ~F (r) u~ | pull tracked branch and rebase (see note below) |
| ~gr~ | refresh |
| ~j~ | goto next magit section |
| ~C-j~ | next visual line |
@ -183,6 +183,9 @@ Here are the often used bindings inside a =status buffer=:
| ~v or V~ | select multiple lines |
| ~z z~ | stash changes |
*Note:* =GitHub= layer users will have the key bindings to pull commits on ~p~
instead of ~F~ which is taken by the =forge= package to interact with GitHub.
** Staging lines
Magit allows you to stage specific lines by selecting them in a diff and hitting
=s= to stage. Due to inconsistencies between Vim and Emacs editing styles, if