undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-status.txt: render tables correctly under Asciidoctor

Browse Source 
Asciidoctor removes the indentation of each line in these tables, so the
last lines of each table have a completely broken alignment.

Similar to 379805051d ("Documentation: render revisions correctly under
Asciidoctor", 2018-05-06), use an explicit literal block to indicate
that we want to keep the leading whitespace in the tables.

Because this gives us some extra indentation, we can remove the one that
we have been carrying explicitly. That is, drop the first four spaces of
indentation on each line. With Asciidoc (8.6.10), this results in
identical rendering before and after this commit, both for git-status.1
and git-status.html.

Signed-off-by: Martin Ågren <martin.agren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Martin Ågren 2018-12-16 15:28:59 +01:00 committed by Junio C Hamano
parent ad1f243ad9
commit b62eb1d2f4
1 changed files with 85 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Documentation/git-status.txt
View File

@ -197,6 +197,7 @@ codes can be interpreted as follows:
Ignored files are not listed, unless `--ignored` option is in effect,
in which case `XY` are `!!`.
....
X Y Meaning
-------------------------------------------------
[AMD] not updated
@ -222,6 +223,7 @@ in which case `XY` are `!!`.
? ? untracked
! ! ignored
-------------------------------------------------
....
Submodules have more state and instead report
M the submodule has a different HEAD than
@ -281,6 +283,7 @@ don't recognize.
If `--branch` is given, a series of header lines are printed with
information about the current branch.
....
Line Notes
------------------------------------------------------------
# branch.oid <commit> | (initial) Current commit.
@ -289,6 +292,7 @@ information about the current branch.
# branch.ab +<ahead> -<behind> If upstream is set and
the commit is present.
------------------------------------------------------------
....
### Changed Tracked Entries
@ -306,6 +310,7 @@ Renamed or copied entries have the following format:
2 <XY> <sub> <mH> <mI> <mW> <hH> <hI> <X><score> <path><sep><origPath>
....
Field Meaning
--------------------------------------------------------
<XY> A 2 character field containing the staged and
@ -335,12 +340,14 @@ Renamed or copied entries have the following format:
This is only present in a renamed/copied entry, and
tells where the renamed/copied contents came from.
--------------------------------------------------------
....
Unmerged entries have the following format; the first character is
a "u" to distinguish from ordinary changed entries.
u <xy> <sub> <m1> <m2> <m3> <mW> <h1> <h2> <h3> <path>
....
Field Meaning
--------------------------------------------------------
<XY> A 2 character field describing the conflict type
@ -356,6 +363,7 @@ a "u" to distinguish from ordinary changed entries.
<h3> The object name in stage 3.
<path> The pathname.
--------------------------------------------------------
....
### Other Items