mirror of
https://github.com/git/git.git
synced 2024-06-09 14:06:12 +02:00
git-status.txt: render tables correctly under Asciidoctor
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
Junio C Hamano
parent
ad1f243ad9
commit
b62eb1d2f4
|
|
@ -197,31 +197,33 @@ 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
|
||||
M [ MD] updated in index
|
||||
A [ MD] added to index
|
||||
D deleted from index
|
||||
R [ MD] renamed in index
|
||||
C [ MD] copied in index
|
||||
[MARC] index and work tree matches
|
||||
[ MARC] M work tree changed since index
|
||||
[ MARC] D deleted in work tree
|
||||
[ D] R renamed in work tree
|
||||
[ D] C copied in work tree
|
||||
-------------------------------------------------
|
||||
D D unmerged, both deleted
|
||||
A U unmerged, added by us
|
||||
U D unmerged, deleted by them
|
||||
U A unmerged, added by them
|
||||
D U unmerged, deleted by us
|
||||
A A unmerged, both added
|
||||
U U unmerged, both modified
|
||||
-------------------------------------------------
|
||||
? ? untracked
|
||||
! ! ignored
|
||||
-------------------------------------------------
|
||||
....
|
||||
X Y Meaning
|
||||
-------------------------------------------------
|
||||
[AMD] not updated
|
||||
M [ MD] updated in index
|
||||
A [ MD] added to index
|
||||
D deleted from index
|
||||
R [ MD] renamed in index
|
||||
C [ MD] copied in index
|
||||
[MARC] index and work tree matches
|
||||
[ MARC] M work tree changed since index
|
||||
[ MARC] D deleted in work tree
|
||||
[ D] R renamed in work tree
|
||||
[ D] C copied in work tree
|
||||
-------------------------------------------------
|
||||
D D unmerged, both deleted
|
||||
A U unmerged, added by us
|
||||
U D unmerged, deleted by them
|
||||
U A unmerged, added by them
|
||||
D U unmerged, deleted by us
|
||||
A A unmerged, both added
|
||||
U U unmerged, both modified
|
||||
-------------------------------------------------
|
||||
? ? untracked
|
||||
! ! ignored
|
||||
-------------------------------------------------
|
||||
....
|
||||
|
||||
Submodules have more state and instead report
|
||||
M the submodule has a different HEAD than
|
||||
|
|
@ -281,14 +283,16 @@ 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.
|
||||
# branch.head <branch> | (detached) Current branch.
|
||||
# branch.upstream <upstream_branch> If upstream is set.
|
||||
# branch.ab +<ahead> -<behind> If upstream is set and
|
||||
the commit is present.
|
||||
------------------------------------------------------------
|
||||
....
|
||||
Line Notes
|
||||
------------------------------------------------------------
|
||||
# branch.oid <commit> | (initial) Current commit.
|
||||
# branch.head <branch> | (detached) Current branch.
|
||||
# branch.upstream <upstream_branch> If upstream is set.
|
||||
# branch.ab +<ahead> -<behind> If upstream is set and
|
||||
the commit is present.
|
||||
------------------------------------------------------------
|
||||
....
|
||||
|
||||
### Changed Tracked Entries
|
||||
|
||||
|
|
@ -306,56 +310,60 @@ 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
|
||||
unstaged XY values described in the short format,
|
||||
with unchanged indicated by a "." rather than
|
||||
a space.
|
||||
<sub> A 4 character field describing the submodule state.
|
||||
"N..." when the entry is not a submodule.
|
||||
"S<c><m><u>" when the entry is a submodule.
|
||||
<c> is "C" if the commit changed; otherwise ".".
|
||||
<m> is "M" if it has tracked changes; otherwise ".".
|
||||
<u> is "U" if there are untracked changes; otherwise ".".
|
||||
<mH> The octal file mode in HEAD.
|
||||
<mI> The octal file mode in the index.
|
||||
<mW> The octal file mode in the worktree.
|
||||
<hH> The object name in HEAD.
|
||||
<hI> The object name in the index.
|
||||
<X><score> The rename or copy score (denoting the percentage
|
||||
of similarity between the source and target of the
|
||||
move or copy). For example "R100" or "C75".
|
||||
<path> The pathname. In a renamed/copied entry, this
|
||||
is the target path.
|
||||
<sep> When the `-z` option is used, the 2 pathnames are separated
|
||||
with a NUL (ASCII 0x00) byte; otherwise, a tab (ASCII 0x09)
|
||||
byte separates them.
|
||||
<origPath> The pathname in the commit at HEAD or in the index.
|
||||
This is only present in a renamed/copied entry, and
|
||||
tells where the renamed/copied contents came from.
|
||||
--------------------------------------------------------
|
||||
....
|
||||
Field Meaning
|
||||
--------------------------------------------------------
|
||||
<XY> A 2 character field containing the staged and
|
||||
unstaged XY values described in the short format,
|
||||
with unchanged indicated by a "." rather than
|
||||
a space.
|
||||
<sub> A 4 character field describing the submodule state.
|
||||
"N..." when the entry is not a submodule.
|
||||
"S<c><m><u>" when the entry is a submodule.
|
||||
<c> is "C" if the commit changed; otherwise ".".
|
||||
<m> is "M" if it has tracked changes; otherwise ".".
|
||||
<u> is "U" if there are untracked changes; otherwise ".".
|
||||
<mH> The octal file mode in HEAD.
|
||||
<mI> The octal file mode in the index.
|
||||
<mW> The octal file mode in the worktree.
|
||||
<hH> The object name in HEAD.
|
||||
<hI> The object name in the index.
|
||||
<X><score> The rename or copy score (denoting the percentage
|
||||
of similarity between the source and target of the
|
||||
move or copy). For example "R100" or "C75".
|
||||
<path> The pathname. In a renamed/copied entry, this
|
||||
is the target path.
|
||||
<sep> When the `-z` option is used, the 2 pathnames are separated
|
||||
with a NUL (ASCII 0x00) byte; otherwise, a tab (ASCII 0x09)
|
||||
byte separates them.
|
||||
<origPath> The pathname in the commit at HEAD or in the index.
|
||||
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
|
||||
as described in the short format.
|
||||
<sub> A 4 character field describing the submodule state
|
||||
as described above.
|
||||
<m1> The octal file mode in stage 1.
|
||||
<m2> The octal file mode in stage 2.
|
||||
<m3> The octal file mode in stage 3.
|
||||
<mW> The octal file mode in the worktree.
|
||||
<h1> The object name in stage 1.
|
||||
<h2> The object name in stage 2.
|
||||
<h3> The object name in stage 3.
|
||||
<path> The pathname.
|
||||
--------------------------------------------------------
|
||||
....
|
||||
Field Meaning
|
||||
--------------------------------------------------------
|
||||
<XY> A 2 character field describing the conflict type
|
||||
as described in the short format.
|
||||
<sub> A 4 character field describing the submodule state
|
||||
as described above.
|
||||
<m1> The octal file mode in stage 1.
|
||||
<m2> The octal file mode in stage 2.
|
||||
<m3> The octal file mode in stage 3.
|
||||
<mW> The octal file mode in the worktree.
|
||||
<h1> The object name in stage 1.
|
||||
<h2> The object name in stage 2.
|
||||
<h3> The object name in stage 3.
|
||||
<path> The pathname.
|
||||
--------------------------------------------------------
|
||||
....
|
||||
|
||||
### Other Items
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue