From: Markus Heidelberg <markus.heidelberg@web.de>
Date: Fri, 16 Jan 2009 21:42:33 +0000 (+0100)
Subject: Documentation: let asciidoc align related options
X-Git-Tag: v1.6.1.3~4^2~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/bf474e2402e51843e8230c064da6ccfdf3a8ff54?ds=inline;hp=--cc

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>
---

bf474e2402e51843e8230c064da6ccfdf3a8ff54
diff --git a/Documentation/git-diff-files.txt b/Documentation/git-diff-files.txt
index 5c8c1d95a8..c526141564 100644
--- a/Documentation/git-diff-files.txt
+++ b/Documentation/git-diff-files.txt
@@ -21,7 +21,10 @@ OPTIONS
 -------
 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.