Skip to content

Commit 4724f31

Browse files
Martin Ågrengitster
authored andcommitted
git-reset.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 3798050 ("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 six spaces of indentation on each line. With Asciidoc (8.6.10), this results in identical rendering before and after this commit, both for git-reset.1 and git-reset.html. Reported-by: Paweł Samoraj <[email protected]> Signed-off-by: Martin Ågren <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 98cdfbb commit 4724f31

File tree

1 file changed

+78
-62
lines changed

1 file changed

+78
-62
lines changed

Documentation/git-reset.txt

Lines changed: 78 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -362,53 +362,65 @@ index in state B. It resets (i.e. moves) the HEAD (i.e. the tip of
362362
the current branch, if you are on one) to "target" (which has the file
363363
in state D).
364364

365-
working index HEAD target working index HEAD
366-
----------------------------------------------------
367-
A B C D --soft A B D
368-
--mixed A D D
369-
--hard D D D
370-
--merge (disallowed)
371-
--keep (disallowed)
372-
373-
working index HEAD target working index HEAD
374-
----------------------------------------------------
375-
A B C C --soft A B C
376-
--mixed A C C
377-
--hard C C C
378-
--merge (disallowed)
379-
--keep A C C
380-
381-
working index HEAD target working index HEAD
382-
----------------------------------------------------
383-
B B C D --soft B B D
384-
--mixed B D D
385-
--hard D D D
386-
--merge D D D
387-
--keep (disallowed)
388-
389-
working index HEAD target working index HEAD
390-
----------------------------------------------------
391-
B B C C --soft B B C
392-
--mixed B C C
393-
--hard C C C
394-
--merge C C C
395-
--keep B C C
396-
397-
working index HEAD target working index HEAD
398-
----------------------------------------------------
399-
B C C D --soft B C D
400-
--mixed B D D
401-
--hard D D D
402-
--merge (disallowed)
403-
--keep (disallowed)
404-
405-
working index HEAD target working index HEAD
406-
----------------------------------------------------
407-
B C C C --soft B C C
408-
--mixed B C C
409-
--hard C C C
410-
--merge B C C
411-
--keep B C C
365+
....
366+
working index HEAD target working index HEAD
367+
----------------------------------------------------
368+
A B C D --soft A B D
369+
--mixed A D D
370+
--hard D D D
371+
--merge (disallowed)
372+
--keep (disallowed)
373+
....
374+
375+
....
376+
working index HEAD target working index HEAD
377+
----------------------------------------------------
378+
A B C C --soft A B C
379+
--mixed A C C
380+
--hard C C C
381+
--merge (disallowed)
382+
--keep A C C
383+
....
384+
385+
....
386+
working index HEAD target working index HEAD
387+
----------------------------------------------------
388+
B B C D --soft B B D
389+
--mixed B D D
390+
--hard D D D
391+
--merge D D D
392+
--keep (disallowed)
393+
....
394+
395+
....
396+
working index HEAD target working index HEAD
397+
----------------------------------------------------
398+
B B C C --soft B B C
399+
--mixed B C C
400+
--hard C C C
401+
--merge C C C
402+
--keep B C C
403+
....
404+
405+
....
406+
working index HEAD target working index HEAD
407+
----------------------------------------------------
408+
B C C D --soft B C D
409+
--mixed B D D
410+
--hard D D D
411+
--merge (disallowed)
412+
--keep (disallowed)
413+
....
414+
415+
....
416+
working index HEAD target working index HEAD
417+
----------------------------------------------------
418+
B C C C --soft B C C
419+
--mixed B C C
420+
--hard C C C
421+
--merge B C C
422+
--keep B C C
423+
....
412424

413425
"reset --merge" is meant to be used when resetting out of a conflicted
414426
merge. Any mergy operation guarantees that the working tree file that is
@@ -431,21 +443,25 @@ entries.
431443
The following tables show what happens when there are unmerged
432444
entries:
433445

434-
working index HEAD target working index HEAD
435-
----------------------------------------------------
436-
X U A B --soft (disallowed)
437-
--mixed X B B
438-
--hard B B B
439-
--merge B B B
440-
--keep (disallowed)
441-
442-
working index HEAD target working index HEAD
443-
----------------------------------------------------
444-
X U A A --soft (disallowed)
445-
--mixed X A A
446-
--hard A A A
447-
--merge A A A
448-
--keep (disallowed)
446+
....
447+
working index HEAD target working index HEAD
448+
----------------------------------------------------
449+
X U A B --soft (disallowed)
450+
--mixed X B B
451+
--hard B B B
452+
--merge B B B
453+
--keep (disallowed)
454+
....
455+
456+
....
457+
working index HEAD target working index HEAD
458+
----------------------------------------------------
459+
X U A A --soft (disallowed)
460+
--mixed X A A
461+
--hard A A A
462+
--merge A A A
463+
--keep (disallowed)
464+
....
449465

450466
X means any state and U means an unmerged index.
451467

0 commit comments

Comments
 (0)