{"thread":{"id":"3556","subject":"[PATCH] AsciiDoc fix for tutorial","startedAt":"2006-03-04T16:35:27Z","lastAt":"2006-03-04T23:07:26Z","messageCount":3,"participants":["Francis Daly","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"17151","messageId":"20060304163527.GA12015@craic.sysops.org","threadId":"3556","inReplyTo":null,"subject":"[PATCH] AsciiDoc fix for tutorial","fromName":"Francis Daly","fromEmail":"francis@daoine.org","sentAt":"2006-03-04T16:35:27Z","receivedAt":"2006-03-04T16:35:27Z","isPatch":true,"sender":{"key":"francis@daoine.org","avatar":null},"body":"RE \\^.+\\^ becomes <sup>. Not wanted here\n\n---\n\n Documentation/tutorial.txt |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\n7b81a656bfa1faea449f4c9c083d69f940912a8d\ndiff --git a/Documentation/tutorial.txt b/Documentation/tutorial.txt\nindex 66680d7..268a877 100644\n--- a/Documentation/tutorial.txt\n+++ b/Documentation/tutorial.txt\n@@ -309,7 +309,7 @@ git diff HEAD^^ HEAD^\n -------------------------------------\n \n shows the difference between that previous state and the state two\n-commits ago.  Also, HEAD~5 can be used as a shorthand for HEAD^^^^^,\n+commits ago.  Also, HEAD~5 can be used as a shorthand for HEAD{caret}{caret}{caret}^^,\n and more generally HEAD~n can refer to the nth previous commit.\n Commits representing merges have more than one parent, and you can\n specify which parent to follow in that case; see\n-- \n1.2.GIT\n\n-- \nFrancis Daly        francis@daoine.org\n"},{"id":"17154","messageId":"7v4q2dri8c.fsf@assigned-by-dhcp.cox.net","threadId":"3556","inReplyTo":"20060304163527.GA12015@craic.sysops.org","subject":"Re: [PATCH] AsciiDoc fix for tutorial","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-03-04T21:51:47Z","receivedAt":"2006-03-04T21:51:47Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Francis Daly <francis@daoine.org> writes:\n\n>  shows the difference between that previous state and the state two\n> -commits ago.  Also, HEAD~5 can be used as a shorthand for HEAD^^^^^,\n> +commits ago.  Also, HEAD~5 can be used as a shorthand for HEAD{caret}{caret}{caret}^^,\n\nThanks.  Why not 5 {caret}, not just three {caret} plus ^^?\n"},{"id":"17159","messageId":"20060304230726.GA13159@craic.sysops.org","threadId":"3556","inReplyTo":"7v4q2dri8c.fsf@assigned-by-dhcp.cox.net","subject":"Re: [PATCH] AsciiDoc fix for tutorial","fromName":"Francis Daly","fromEmail":"francis@daoine.org","sentAt":"2006-03-04T23:07:26Z","receivedAt":"2006-03-04T23:07:26Z","isPatch":true,"sender":{"key":"francis@daoine.org","avatar":null},"body":"On Sat, Mar 04, 2006 at 01:51:47PM -0800, Junio C Hamano wrote:\n> Francis Daly <francis@daoine.org> writes:\n> \n> >  shows the difference between that previous state and the state two\n> > -commits ago.  Also, HEAD~5 can be used as a shorthand for HEAD^^^^^,\n> > +commits ago.  Also, HEAD~5 can be used as a shorthand for HEAD{caret}{caret}{caret}^^,\n> \n> Thanks.  Why not 5 {caret}, not just three {caret} plus ^^?\n\nNo real reason; the asciidoc parser accepts two together so I left them\nthere.  Anyone reading a transformed version should see the real ^s,\nso the question is whether it's clearer for someone reading the .txt\nfile to see a mixture with a passing resemblance to a few lines earlier,\nor just to see {caret} consistently.\n\n5 {caret} is fine by me.\n\nFor more consistency, there are three other ^s in the file could which\ncould also be changed, but none of them cause breakage now.\n\n\tf\n-- \nFrancis Daly        francis@daoine.org\n"}]}