{"thread":{"id":"35107","subject":"[PATCH] howto/revert-a-faulty-merge.txt: Fix asciidoc formatting","startedAt":"2013-10-11T18:24:14Z","lastAt":"2013-10-11T18:24:14Z","messageCount":1,"participants":["Ramsay Jones"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"228747","messageId":"5258424E.1000804@ramsay1.demon.co.uk","threadId":"35107","inReplyTo":null,"subject":"[PATCH] howto/revert-a-faulty-merge.txt: Fix asciidoc formatting","fromName":"Ramsay Jones","fromEmail":"ramsay@ramsay1.demon.co.uk","sentAt":"2013-10-11T18:24:14Z","receivedAt":"2013-10-11T18:24:14Z","isPatch":true,"sender":{"key":"ramsay@ramsayjones.plus.com","avatar":"https://avatars.githubusercontent.com/u/33702710?v=4"},"body":"\nSeveral uses of the '^' operator are being interpreted by asciidoc\nas requests to show the following text as a superscript. In order\nto fix this problem, use backticks (`) to quote the text of the\naffected git command invocations.\n\nSigned-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>\n---\n\nHi Jonathan,\n\nJust noticed this in passing ... I don't know asciidoc that well, so\nif there is a better way to fix this, just let me know. ;-)\n\nATB,\nRamsay Jones\n\n Documentation/howto/revert-a-faulty-merge.txt | 8 ++++----\n 1 file changed, 4 insertions(+), 4 deletions(-)\n\ndiff --git a/Documentation/howto/revert-a-faulty-merge.txt b/Documentation/howto/revert-a-faulty-merge.txt\nindex 075418e..acf3e47 100644\n--- a/Documentation/howto/revert-a-faulty-merge.txt\n+++ b/Documentation/howto/revert-a-faulty-merge.txt\n@@ -37,7 +37,7 @@ where A and B are on the side development that was not so good, M is the\n merge that brings these premature changes into the mainline, x are changes\n unrelated to what the side branch did and already made on the mainline,\n and W is the \"revert of the merge M\" (doesn't W look M upside down?).\n-IOW, \"diff W^..W\" is similar to \"diff -R M^..M\".\n+IOW, `\"diff W^..W\"` is similar to `\"diff -R M^..M\"`.\n \n Such a \"revert\" of a merge can be made with:\n \n@@ -121,9 +121,9 @@ If you reverted the revert in such a case as in the previous example:\n        ---A---B                   A'--B'--C'\n \n where Y is the revert of W, A' and B' are rerolled A and B, and there may\n-also be a further fix-up C' on the side branch.  \"diff Y^..Y\" is similar\n-to \"diff -R W^..W\" (which in turn means it is similar to \"diff M^..M\"),\n-and \"diff A'^..C'\" by definition would be similar but different from that,\n+also be a further fix-up C' on the side branch.  `\"diff Y^..Y\"` is similar\n+to `\"diff -R W^..W\"` (which in turn means it is similar to `\"diff M^..M\"`),\n+and `\"diff A'^..C'\"` by definition would be similar but different from that,\n because it is a rerolled series of the earlier change.  There will be a\n lot of overlapping changes that result in conflicts.  So do not do \"revert\n of revert\" blindly without thinking..\n-- \n1.8.4\n"}]}