Skip to content

Commit bf474e2

Browse files
marcowsgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 9968696 commit bf474e2

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

Documentation/git-diff-files.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@ OPTIONS
2121
-------
2222
include::diff-options.txt[]
2323

24-
-1 -2 -3 or --base --ours --theirs, and -0::
24+
-1 --base::
25+
-2 --ours::
26+
-3 --theirs::
27+
-0::
2528
Diff against the "base" version, "our branch" or "their
2629
branch" respectively. With these options, diffs for
2730
merged entries are not shown.

0 commit comments

Comments
 (0)