diff --git a/contrib/git/README.md b/contrib/git/README.md index 093c269e3..b547a67ca 100644 --- a/contrib/git/README.md +++ b/contrib/git/README.md @@ -18,6 +18,7 @@ - [Working with Git](#working-with-git) - [Magit](#magit) - [Quick guide for recurring use cases in Magit](#quick-guide-for-recurring-use-cases-in-magit) + - [Git time machine](#git-time-machine) - [Git gutter](#git-gutter) - [Github support](#github-support) - [magit-gh-pulls](#magit-gh-pulls) @@ -217,6 +218,19 @@ you can answer `y` with no issue. - `F -r C-u F` and choose `upstream` or the name you gave to it - `P P` to push the commit to `origin` +### Git time machine + +[git-timemachine] allows to quickly browse the commits of the current buffer. + + Key Binding | Description +--------------------|------------------------------------------------------------ +SPC g t | start git timemachine and initiate micro-state +c | show current commit +n | show next commit +N | show previous commit +p | show previous commit +q | leave micro-state and git timemachine + ### Git gutter With [git-gutter][] it is possible to navigate between hunks, stage them and @@ -224,12 +238,12 @@ revert them. Git gutter hunks commands start with `gh`: - Key Binding | Description ---------------------|------------------------------------------------------------ -g h n | next hunk in buffer -g h N | previous hunk in buffer -g h r | revert current hunk -g h s | stage current hunk + Key Binding | Description +----------------------|------------------------------------------------------------ +SPC g h n | next hunk in buffer +SPC g h N | previous hunk in buffer +SPC g h r | revert current hunk +SPC g h s | stage current hunk `Spacemacs` has custom fringe bitmaps for [git-gutter-fringe][git-gutter]: @@ -286,6 +300,12 @@ In the gist list buffer: V | `visual-line state` y | print URL and copy it +### github-browse-file + + Key Binding | Description +----------------------|------------------------------------------------------------ +SPC g f b | browse to file on github + [git]: http://git-scm.com/ [download page]: http://git-scm.com/downloads [git-gutter]: https://github.com/syohex/emacs-git-gutter-fringe @@ -296,10 +316,3 @@ In the gist list buffer: [git-messenger]: https://github.com/syohex/emacs-git-messenger [magit-gh-pulls]: https://github.com/sigma/magit-gh-pulls [gist.el]: https://github.com/defunkt/gist.el - -### github-browse-file - - Key Binding | Description -----------------------|------------------------------------------------------------ -SPC g f b | browse to file on github -