aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-diff-files.txt
diff options
context:
space:
mode:
authorMarkus Heidelberg <markus.heidelberg@web.de>2009-01-16 22:42:33 +0100
committerJunio C Hamano <gitster@pobox.com>2009-01-17 18:01:46 -0800
commitbf474e2402e51843e8230c064da6ccfdf3a8ff54 (patch)
tree7d65d2b678985f701a28e3ba9c81ec0e7fc4d418 /Documentation/git-diff-files.txt
parent996869601594ffefb67238175055922340ced6f8 (diff)
downloadgit-bf474e2402e51843e8230c064da6ccfdf3a8ff54.tar.gz
git-bf474e2402e51843e8230c064da6ccfdf3a8ff54.tar.xz
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>
Diffstat (limited to 'Documentation/git-diff-files.txt')
-rw-r--r--Documentation/git-diff-files.txt5
1 files changed, 4 insertions, 1 deletions
diff --git a/Documentation/git-diff-files.txt b/Documentation/git-diff-files.txt
index 5c8c1d95a..c52614156 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.