# [PATCH] AsciiDoc fix for tutorial 3 messages from 2006-03-04 to 2006-03-04. Participants: Francis Daly, Junio C Hamano. Thread: https://gitlist.dev/t/3556 ## Francis Daly, 2006-03-04 16:35 Subject: [PATCH] AsciiDoc fix for tutorial Message-ID: <20060304163527.GA12015@craic.sysops.org> URL: https://gitlist.dev/e/20060304163527.GA12015%40craic.sysops.org ``` RE \^.+\^ becomes . Not wanted here --- Documentation/tutorial.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) 7b81a656bfa1faea449f4c9c083d69f940912a8d diff --git a/Documentation/tutorial.txt b/Documentation/tutorial.txt index 66680d7..268a877 100644 --- a/Documentation/tutorial.txt +++ b/Documentation/tutorial.txt @@ -309,7 +309,7 @@ git diff HEAD^^ HEAD^ ------------------------------------- shows the difference between that previous state and the state two -commits ago. Also, HEAD~5 can be used as a shorthand for HEAD^^^^^, +commits ago. Also, HEAD~5 can be used as a shorthand for HEAD{caret}{caret}{caret}^^, and more generally HEAD~n can refer to the nth previous commit. Commits representing merges have more than one parent, and you can specify which parent to follow in that case; see -- 1.2.GIT -- Francis Daly francis@daoine.org ``` ## Junio C Hamano, 2006-03-04 21:51 Subject: Re: [PATCH] AsciiDoc fix for tutorial Message-ID: <7v4q2dri8c.fsf@assigned-by-dhcp.cox.net> URL: https://gitlist.dev/e/7v4q2dri8c.fsf%40assigned-by-dhcp.cox.net In-Reply-To: <20060304163527.GA12015@craic.sysops.org> ``` Francis Daly writes: > shows the difference between that previous state and the state two > -commits ago. Also, HEAD~5 can be used as a shorthand for HEAD^^^^^, > +commits ago. Also, HEAD~5 can be used as a shorthand for HEAD{caret}{caret}{caret}^^, Thanks. Why not 5 {caret}, not just three {caret} plus ^^? ``` ## Francis Daly, 2006-03-04 23:07 Subject: Re: [PATCH] AsciiDoc fix for tutorial Message-ID: <20060304230726.GA13159@craic.sysops.org> URL: https://gitlist.dev/e/20060304230726.GA13159%40craic.sysops.org In-Reply-To: <7v4q2dri8c.fsf@assigned-by-dhcp.cox.net> ``` On Sat, Mar 04, 2006 at 01:51:47PM -0800, Junio C Hamano wrote: > Francis Daly writes: > > > shows the difference between that previous state and the state two > > -commits ago. Also, HEAD~5 can be used as a shorthand for HEAD^^^^^, > > +commits ago. Also, HEAD~5 can be used as a shorthand for HEAD{caret}{caret}{caret}^^, > > Thanks. Why not 5 {caret}, not just three {caret} plus ^^? No real reason; the asciidoc parser accepts two together so I left them there. Anyone reading a transformed version should see the real ^s, so the question is whether it's clearer for someone reading the .txt file to see a mixture with a passing resemblance to a few lines earlier, or just to see {caret} consistently. 5 {caret} is fine by me. For more consistency, there are three other ^s in the file could which could also be changed, but none of them cause breakage now. f -- Francis Daly francis@daoine.org ```