kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Ramsay Jones 2013-10-11 19:24:14 +01:00 committed by Jonathan Nieder
parent 6430692135
commit 78bef06589
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Documentation/howto/revert-a-faulty-merge.txt
View File

@ -37,7 +37,7 @@ where A and B are on the side development that was not so good, M is the
merge that brings these premature changes into the mainline, x are changes merge that brings these premature changes into the mainline, x are changes
unrelated to what the side branch did and already made on the mainline, unrelated to what the side branch did and already made on the mainline,
and W is the "revert of the merge M" (doesn't W look M upside down?). and W is the "revert of the merge M" (doesn't W look M upside down?).
IOW, "diff W^..W" is similar to "diff -R M^..M". IOW, `"diff W^..W"` is similar to `"diff -R M^..M"`.


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


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


where Y is the revert of W, A' and B' are rerolled A and B, and there may where Y is the revert of W, A' and B' are rerolled A and B, and there may
also be a further fix-up C' on the side branch. "diff Y^..Y" is similar also be a further fix-up C' on the side branch. `"diff Y^..Y"` is similar
to "diff -R W^..W" (which in turn means it is similar to "diff M^..M"), to `"diff -R W^..W"` (which in turn means it is similar to `"diff M^..M"`),
and "diff A'^..C'" by definition would be similar but different from that, and `"diff A'^..C'"` by definition would be similar but different from that,
because it is a rerolled series of the earlier change. There will be a because it is a rerolled series of the earlier change. There will be a
lot of overlapping changes that result in conflicts. So do not do "revert lot of overlapping changes that result in conflicts. So do not do "revert
of revert" blindly without thinking.. of revert" blindly without thinking..