branch: master commit 59c27246f8034df561009f9ed7d1aef650ee228b Author: Justin Burkett <jus...@burkett.cc> Commit: Justin Burkett <jus...@burkett.cc>
Mention send/receive and step functions in README * README.org: Update --- README.org | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/README.org b/README.org index 1ba7494..2d30c9e 100644 --- a/README.org +++ b/README.org @@ -5,13 +5,13 @@ A tool like vimdiff for Emacs ** Table of Contents :TOC: - - [[#vdiff][vdiff]] - - [[#introduction][Introduction]] - - [[#recent-significant-changes][Recent (Significant) Changes]] - - [[#screenshot][Screenshot]] - - [[#installation-and-usage][Installation and Usage]] - - [[#hydra][Hydra]] - - [[#further-customization][Further customization]] +- [[#vdiff][vdiff]] + - [[#introduction][Introduction]] + - [[#recent-significant-changes][Recent (Significant) Changes]] + - [[#screenshot][Screenshot]] + - [[#installation-and-usage][Installation and Usage]] + - [[#hydra][Hydra]] + - [[#further-customization][Further customization]] ** Introduction @@ -89,7 +89,9 @@ the commands would be | Key | Command | Description | |---------+------------------------------------+-------------------------------------| | =C-c r= | =vdiff-receive-changes= | Receive change from other buffer | +| =C-c R= | =vdiff-receive-changes-and-step= | Same as =C-c r= then =C-c n= | | =C-c s= | =vdiff-send-changes= | Send this change(s) to other buffer | +| =C-c S= | =vdiff-send-changes-and-step= | Same as =C-c s= then =C-c n= | | =C-c f= | =vdiff-refine-this-hunk= | Highlight changed words in hunk | | =C-c x= | =vdiff-remove-refinements-in-hunk= | Remove refinement highlighting | | (none) | =vdiff-refine-this-hunk-symbol= | Refine based on symbols |