Revert "Mention breaking change for pull key binding with GitHub and forge"

This reverts commit 36c1291081.
This commit is contained in:
syl20bnr 2019-02-16 09:53:34 -05:00
parent 95422ae5d5
commit 63f9a92348
2 changed files with 1 additions and 10 deletions

View File

@ -152,10 +152,6 @@ Kraemer, Yi Liu, and Jack Kamm):
- Key bindings;
- Changed ~SPC g f h~ to ~SPC g f l~ for 'git log' of current file (thanks to
Ag Ibragimov)
***** GitHub
- Key bindings;
- 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=
***** gtags
- Key bindings;
- Regenerate tags are now under ~SPC m g C~ instead of ~SPC m g c~.
@ -1200,8 +1196,6 @@ Other:
- Remove package =magit-gh-pulls= as it was deprecated in favor of =magithub=
and =forge= (thanks to Robby O'Connor )
- 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=
- Added ~g r~ evilified binding to gist-list-mode (thanks to Jean-Sebastien A.
Beaudry)
- Replace =evilified-state-evilify= by =evilified-state-evilify-map= (thanks to

View File

@ -151,7 +151,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 (see note below) |
| ~F (r) u~ | pull tracked branch and rebase |
| ~gr~ | refresh |
| ~j~ | goto next magit section |
| ~C-j~ | next visual line |
@ -175,9 +175,6 @@ 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