Skip to content

Commit 78bef06

Browse files
Ramsay Jonesjrn
authored andcommitted
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 <[email protected]> Signed-off-by: Jonathan Nieder <[email protected]>
1 parent 6430692 commit 78bef06

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

Documentation/howto/revert-a-faulty-merge.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ where A and B are on the side development that was not so good, M is the
3737
merge that brings these premature changes into the mainline, x are changes
3838
unrelated to what the side branch did and already made on the mainline,
3939
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"`.
4141

4242
Such a "revert" of a merge can be made with:
4343

@@ -121,9 +121,9 @@ If you reverted the revert in such a case as in the previous example:
121121
---A---B A'--B'--C'
122122

123123
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,
127127
because it is a rerolled series of the earlier change. There will be a
128128
lot of overlapping changes that result in conflicts. So do not do "revert
129129
of revert" blindly without thinking..

0 commit comments

Comments
 (0)