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>
Martin Ågren committed
Dec 16, 2018 at 15:28 UTC
b62eb1d2f4d19bcc42945eb6e2d231da1dfdcb50
1 file changed
+85
-77
Documentation/git-status.txt
+85
-77
@@ -197,31 +197,33 @@ codes can be interpreted as follows:
197
Ignored files are not listed, unless `--ignored` option is in effect,
198
in which case `XY` are `!!`.
199
200
- X Y Meaning
201
- -------------------------------------------------
202
- [AMD] not updated
203
- M [ MD] updated in index
204
- A [ MD] added to index
205
- D deleted from index
206
- R [ MD] renamed in index
207
- C [ MD] copied in index
208
- [MARC] index and work tree matches
209
- [ MARC] M work tree changed since index
210
- [ MARC] D deleted in work tree
211
- [ D] R renamed in work tree
212
- [ D] C copied in work tree
213
- -------------------------------------------------
214
- D D unmerged, both deleted
215
- A U unmerged, added by us
216
- U D unmerged, deleted by them
217
- U A unmerged, added by them
218
- D U unmerged, deleted by us
219
- A A unmerged, both added
220
- U U unmerged, both modified
221
- -------------------------------------------------
222
- ? ? untracked
223
- ! ! ignored
224
- -------------------------------------------------
200
+....
201
+X Y Meaning
202
+-------------------------------------------------
203
+ [AMD] not updated
204
+M [ MD] updated in index
205
+A [ MD] added to index
206
+D deleted from index
207
+R [ MD] renamed in index
208
+C [ MD] copied in index
209
+[MARC] index and work tree matches
210
+[ MARC] M work tree changed since index
211
+[ MARC] D deleted in work tree
212
+[ D] R renamed in work tree
213
+[ D] C copied in work tree
214
+-------------------------------------------------
215
+D D unmerged, both deleted
216
+A U unmerged, added by us
217
+U D unmerged, deleted by them
218
+U A unmerged, added by them
219
+D U unmerged, deleted by us
220
+A A unmerged, both added
221
+U U unmerged, both modified
222
+-------------------------------------------------
223
+? ? untracked
224
+! ! ignored
225
+-------------------------------------------------
226
+....
227
228
Submodules have more state and instead report
229
M the submodule has a different HEAD than
@@ -281,14 +283,16 @@ don't recognize.
283
If `--branch` is given, a series of header lines are printed with
284
information about the current branch.
285
284
- Line Notes
285
- ------------------------------------------------------------
286
- # branch.oid <commit> | (initial) Current commit.
287
- # branch.head <branch> | (detached) Current branch.
288
- # branch.upstream <upstream_branch> If upstream is set.
289
- # branch.ab +<ahead> -<behind> If upstream is set and
290
- the commit is present.
291
- ------------------------------------------------------------
286
+....
287
+Line Notes
288
+------------------------------------------------------------
289
+# branch.oid <commit> | (initial) Current commit.
290
+# branch.head <branch> | (detached) Current branch.
291
+# branch.upstream <upstream_branch> If upstream is set.
292
+# branch.ab +<ahead> -<behind> If upstream is set and
293
+ the commit is present.
294
+------------------------------------------------------------
295
+....
296
297
### Changed Tracked Entries
298
@@ -306,56 +310,60 @@ Renamed or copied entries have the following format:
310
311
2 <XY> <sub> <mH> <mI> <mW> <hH> <hI> <X><score> <path><sep><origPath>
312
309
- Field Meaning
310
- --------------------------------------------------------
311
- <XY> A 2 character field containing the staged and
312
- unstaged XY values described in the short format,
313
- with unchanged indicated by a "." rather than
314
- a space.
315
- <sub> A 4 character field describing the submodule state.
316
- "N..." when the entry is not a submodule.
317
- "S<c><m><u>" when the entry is a submodule.
318
- <c> is "C" if the commit changed; otherwise ".".
319
- <m> is "M" if it has tracked changes; otherwise ".".
320
- <u> is "U" if there are untracked changes; otherwise ".".
321
- <mH> The octal file mode in HEAD.
322
- <mI> The octal file mode in the index.
323
- <mW> The octal file mode in the worktree.
324
- <hH> The object name in HEAD.
325
- <hI> The object name in the index.
326
- <X><score> The rename or copy score (denoting the percentage
327
- of similarity between the source and target of the
328
- move or copy). For example "R100" or "C75".
329
- <path> The pathname. In a renamed/copied entry, this
330
- is the target path.
331
- <sep> When the `-z` option is used, the 2 pathnames are separated
332
- with a NUL (ASCII 0x00) byte; otherwise, a tab (ASCII 0x09)
333
- byte separates them.
334
- <origPath> The pathname in the commit at HEAD or in the index.
335
- This is only present in a renamed/copied entry, and
336
- tells where the renamed/copied contents came from.
337
- --------------------------------------------------------
313
+....
314
+Field Meaning
315
+--------------------------------------------------------
316
+<XY> A 2 character field containing the staged and
317
+ unstaged XY values described in the short format,
318
+ with unchanged indicated by a "." rather than
319
+ a space.
320
+<sub> A 4 character field describing the submodule state.
321
+ "N..." when the entry is not a submodule.
322
+ "S<c><m><u>" when the entry is a submodule.
323
+ <c> is "C" if the commit changed; otherwise ".".
324
+ <m> is "M" if it has tracked changes; otherwise ".".
325
+ <u> is "U" if there are untracked changes; otherwise ".".
326
+<mH> The octal file mode in HEAD.
327
+<mI> The octal file mode in the index.
328
+<mW> The octal file mode in the worktree.
329
+<hH> The object name in HEAD.
330
+<hI> The object name in the index.
331
+<X><score> The rename or copy score (denoting the percentage
332
+ of similarity between the source and target of the
333
+ move or copy). For example "R100" or "C75".
334
+<path> The pathname. In a renamed/copied entry, this
335
+ is the target path.
336
+<sep> When the `-z` option is used, the 2 pathnames are separated
337
+ with a NUL (ASCII 0x00) byte; otherwise, a tab (ASCII 0x09)
338
+ byte separates them.
339
+<origPath> The pathname in the commit at HEAD or in the index.
340
+ This is only present in a renamed/copied entry, and
341
+ tells where the renamed/copied contents came from.
342
+--------------------------------------------------------
343
+....
344
345
Unmerged entries have the following format; the first character is
346
a "u" to distinguish from ordinary changed entries.
347
348
u <xy> <sub> <m1> <m2> <m3> <mW> <h1> <h2> <h3> <path>
349
344
- Field Meaning
345
- --------------------------------------------------------
346
- <XY> A 2 character field describing the conflict type
347
- as described in the short format.
348
- <sub> A 4 character field describing the submodule state
349
- as described above.
350
- <m1> The octal file mode in stage 1.
351
- <m2> The octal file mode in stage 2.
352
- <m3> The octal file mode in stage 3.
353
- <mW> The octal file mode in the worktree.
354
- <h1> The object name in stage 1.
355
- <h2> The object name in stage 2.
356
- <h3> The object name in stage 3.
357
- <path> The pathname.
358
- --------------------------------------------------------
350
+....
351
+Field Meaning
352
+--------------------------------------------------------
353
+<XY> A 2 character field describing the conflict type
354
+ as described in the short format.
355
+<sub> A 4 character field describing the submodule state
356
+ as described above.
357
+<m1> The octal file mode in stage 1.
358
+<m2> The octal file mode in stage 2.
359
+<m3> The octal file mode in stage 3.
360
+<mW> The octal file mode in the worktree.
361
+<h1> The object name in stage 1.
362
+<h2> The object name in stage 2.
363
+<h3> The object name in stage 3.
364
+<path> The pathname.
365
+--------------------------------------------------------
366
+....
367
368
### Other Items
369