From 07bd371e21dafded680a91bc34d132e872f0e257 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 15 Jun 2018 14:31:13 +0530 Subject: [PATCH] Re-org diff kitten docs Move the auto-generated bits to the end --- docs/kittens/diff.rst | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/docs/kittens/diff.rst b/docs/kittens/diff.rst index 2e4cd7ed8..f1cc1ef8f 100644 --- a/docs/kittens/diff.rst +++ b/docs/kittens/diff.rst @@ -89,19 +89,6 @@ Scroll to previous match :kbd:`<, ,` ========================= =========================== - -Configuration ------------------------- - -You can configure the colors used, keyboard shortcuts, the diff implementation, -the default lines of context, etc. by creating a :file:`diff.conf` file in -your :ref:`kitty config folder `. See below for the supported -configuration directives. - - -.. include:: /generated/conf-kitten-diff.rst - - Integrating with git ----------------------- @@ -126,11 +113,6 @@ Now to use kitty-diff to view git diffs, you can simply do:: Once again, creating an alias for this command is useful. -Command Line Interface -------------------------- - -.. include:: /generated/cli-kitten-diff.rst - Why does this work only in kitty? ---------------------------------------- @@ -146,6 +128,26 @@ And fundamentally, it's kitty only because I wrote it for myself, and I am highly unlikely to use any other terminals :) + +Configuration +------------------------ + +You can configure the colors used, keyboard shortcuts, the diff implementation, +the default lines of context, etc. by creating a :file:`diff.conf` file in +your :ref:`kitty config folder `. See below for the supported +configuration directives. + + +.. include:: /generated/conf-kitten-diff.rst + + +Command Line Interface +------------------------- + +.. include:: /generated/cli-kitten-diff.rst + + + Sample diff.conf -----------------