Documentation: let asciidoc align related options
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>
Markus Heidelberg committed
Jan 16, 2009 at 22:42 UTC
bf474e2402e51843e8230c064da6ccfdf3a8ff54
1 file changed
+4
-1
Documentation/git-diff-files.txt
+4
-1
@@ -21,7 +21,10 @@ OPTIONS
21
-------
22
include::diff-options.txt[]
23
24
--1 -2 -3 or --base --ours --theirs, and -0::
24
+-1 --base::
25
+-2 --ours::
26
+-3 --theirs::
27
+-0::
28
Diff against the "base" version, "our branch" or "their
29
branch" respectively. With these options, diffs for
30
merged entries are not shown.