doc: fix the 'revert a faulty merge' ASCII art tab spacing
The asciidoctor doc-tool stack does not always respect the 'tab = 8 spaces' rule expectation, particularly for the Git-for-Windows generated html pages. This follows on from the 'doc: fix merge-base ASCII art tab spacing' fix. Use just spaces within the block of the ascii art. All other *.txt ascii art containing three dashes has been checked. Asciidoctor correctly formats the other art blocks that do contain tabs. Signed-off-by: Philip Oakley <philipoakley@iee.org Signed-off-by: Junio C Hamano <gitster@pobox.com>
Philip Oakley committed
Oct 24, 2016 at 22:54 UTC
6750f6269917969dbb191406c3ed31d5a75a9edd
1 file changed
+8
-8
Documentation/howto/revert-a-faulty-merge.txt
+8
-8
@@ -30,7 +30,7 @@ The history immediately after the "revert of the merge" would look like
30
this:
31
32
---o---o---o---M---x---x---W
33
- /
33
+ /
34
---A---B
35
36
where A and B are on the side development that was not so good, M is the
@@ -47,7 +47,7 @@ After the developers of the side branch fix their mistakes, the history
47
may look like this:
48
49
---o---o---o---M---x---x---W---x
50
- /
50
+ /
51
---A---B-------------------C---D
52
53
where C and D are to fix what was broken in A and B, and you may already
@@ -81,7 +81,7 @@ In such a situation, you would want to first revert the previous revert,
81
which would make the history look like this:
82
83
---o---o---o---M---x---x---W---x---Y
84
- /
84
+ /
85
---A---B-------------------C---D
86
87
where Y is the revert of W. Such a "revert of the revert" can be done
@@ -93,14 +93,14 @@ This history would (ignoring possible conflicts between what W and W..Y
93
changed) be equivalent to not having W or Y at all in the history:
94
95
---o---o---o---M---x---x-------x----
96
- /
96
+ /
97
---A---B-------------------C---D
98
99
and merging the side branch again will not have conflict arising from an
100
earlier revert and revert of the revert.
101
102
---o---o---o---M---x---x-------x-------*
103
- / /
103
+ / /
104
---A---B-------------------C---D
105
106
Of course the changes made in C and D still can conflict with what was
@@ -111,13 +111,13 @@ faulty A and B, and redone the changes on top of the updated mainline
111
after the revert, the history would have looked like this:
112
113
---o---o---o---M---x---x---W---x---x
114
- / \
114
+ / \
115
---A---B A'--B'--C'
116
117
If you reverted the revert in such a case as in the previous example:
118
119
---o---o---o---M---x---x---W---x---x---Y---*
120
- / \ /
120
+ / \ /
121
---A---B A'--B'--C'
122
123
where Y is the revert of W, A' and B' are rerolled A and B, and there may
@@ -129,7 +129,7 @@ lot of overlapping changes that result in conflicts. So do not do "revert
129
of revert" blindly without thinking..
130
131
---o---o---o---M---x---x---W---x---x
132
- / \
132
+ / \
133
---A---B A'--B'--C'
134
135
In the history with rebased side branch, W (and M) are behind the merge