diff --git a/CHANGELOG.develop b/CHANGELOG.develop index eb4881a91..e30248373 100644 --- a/CHANGELOG.develop +++ b/CHANGELOG.develop @@ -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 diff --git a/layers/+source-control/git/README.org b/layers/+source-control/git/README.org index a667789a6..12494bf67 100644 --- a/layers/+source-control/git/README.org +++ b/layers/+source-control/git/README.org @@ -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