Documentation: let asciidoc align related options
authorMarkus Heidelberg <markus.heidelberg@web.de>
Fri, 16 Jan 2009 21:42:33 +0000 (22:42 +0100)
committerJunio C Hamano <gitster@pobox.com>
Sun, 18 Jan 2009 02:01:46 +0000 (18:01 -0800)
Command line options can share the same paragraph of description, if
they are related or synonymous. In these cases they should be written
among each other, so that asciidoc can format them itself.

Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-diff-files.txt

index 5c8c1d9..c526141 100644 (file)
@@ -21,7 +21,10 @@ OPTIONS
 -------
 include::diff-options.txt[]
 
 -------
 include::diff-options.txt[]
 
--1 -2 -3 or --base --ours --theirs, and -0::
+-1 --base::
+-2 --ours::
+-3 --theirs::
+-0::
        Diff against the "base" version, "our branch" or "their
        branch" respectively.  With these options, diffs for
        merged entries are not shown.
        Diff against the "base" version, "our branch" or "their
        branch" respectively.  With these options, diffs for
        merged entries are not shown.