About\r
=====\r
\r
-`diff-hl-mode` highlights uncommitted changes on the left fringe of the window,\r
+`diff-hl-mode` highlights uncommitted changes on the left side of the window,\r
allows you to jump between and revert them selectively.\r
\r
-For the usage instructions and the list of commands, see the header comment.\r
+For the usage instructions and the list of commands, see the Commentary section\r
+inside the file.\r
\r
Tested with Git, Mercurial, Bazaar and SVN. May work with other VC backends, too.\r
\r
-Screenshot\r
+The package also contains auxiliary modes:\r
+\r
+* `diff-hl-dired-mode` provides similar functionality in Dired.\r
+* `diff-hl-margin-mode` changes the highlighting function to\r
+ use the margin instead of the fringe.\r
+* `diff-hl-amend-mode` shifts the reference revision back by one.\r
+\r
+Check out the Commentary section in each respective file for the usage\r
+instructions.\r
+\r
+Screenshots\r
=====\r
\r
+diff-hl-mode\r
+-----\r
+Top window: a buffer in this minor mode, bottom window: the corresponding diff.\r
+\r
![screenie](screenshot.png)\r
\r
-Top window: a buffer in this minor mode, bottom window: the corresponding diff.\r
+diff-hl-dired-mode\r
+-----\r
+\r
+![screenie](screenshot-dired.png)\r
+\r
+diff-hl-margin-mode\r
+-----\r
+\r
+![screenie](screenshot-margin.png)\r
\r
Requirements\r
=====\r
maybe we can do something similar to `highlight-markup-buffers` with a hidden\r
buffer containing the unmodified copy.\r
\r
+* We conflict with other modes when they put indicators on the fringe,\r
+ such as [Flycheck](https://github.com/flycheck/flycheck). This is\r
+ rarely a significant problem, since if you're using such a mode,\r
+ you'd usually want to fix all errors and warnings before continuing,\r
+ and then the conflicting indicators go away.\r
+\r
* There's no fringe when Emacs is running in the console, but the navigation and\r
- revert commands still work.\r
+ revert commands still work. Consider turning `diff-hl-margin-mode` on.\r
\r
* Frame-local and buffer-local values of `line-spacing` are not supported.\r
\r