howto/revert-a-faulty-merge: fix unescaped '^'s
Several uses of the '^' operator are being interpreted by asciidoc as requests to show the following text as a superscript. In order to fix this problem, use backticks (`) to quote the text of the affected git command invocations. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Ramsay Jones committed
Oct 11, 2013 at 19:24 UTC
78bef06589dc7570f9b52a6c9fca04d6142cc949
1 file changed
+4
-4
Documentation/howto/revert-a-faulty-merge.txt
+4
-4
@@ -37,7 +37,7 @@ where A and B are on the side development that was not so good, M is the
37
merge that brings these premature changes into the mainline, x are changes
38
unrelated to what the side branch did and already made on the mainline,
39
and W is the "revert of the merge M" (doesn't W look M upside down?).
40
-IOW, "diff W^..W" is similar to "diff -R M^..M".
40
+IOW, `"diff W^..W"` is similar to `"diff -R M^..M"`.
41
42
Such a "revert" of a merge can be made with:
43
@@ -121,9 +121,9 @@ If you reverted the revert in such a case as in the previous example:
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
124
-also be a further fix-up C' on the side branch. "diff Y^..Y" is similar
125
-to "diff -R W^..W" (which in turn means it is similar to "diff M^..M"),
126
-and "diff A'^..C'" by definition would be similar but different from that,
124
+also be a further fix-up C' on the side branch. `"diff Y^..Y"` is similar
125
+to `"diff -R W^..W"` (which in turn means it is similar to `"diff M^..M"`),
126
+and `"diff A'^..C'"` by definition would be similar but different from that,
127
because it is a rerolled series of the earlier change. There will be a
128
lot of overlapping changes that result in conflicts. So do not do "revert
129
of revert" blindly without thinking..