threads / patch / 3556

patchAsciiDoc fix for tutorial

Subject: [PATCH] AsciiDoc fix for tutorial

## tl;dr

3 messages between Mar 4, 2006 and Mar 4, 2006. Diffs are folded; open one to read it.

replies: 2people: 2as markdown or json

Francis Daly· Mar 4, 2006, 16:35 UTC · lore

RE \^.+\^ becomes <sup>. Not wanted here

---

 Documentation/tutorial.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

7b81a656bfa1faea449f4c9c083d69f940912a8d

Show changes to Documentation/tutorial.txt +1 −1

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· Mar 4, 2006, 21:51 UTC · re: Francis Daly · lore

Re: [PATCH] AsciiDoc fix for tutorial

Francis Daly <francis@daoine.org> 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· Mar 4, 2006, 23:07 UTC · re: Junio C Hamano · lore

Re: [PATCH] AsciiDoc fix for tutorial

On Sat, Mar 04, 2006 at 01:51:47PM -0800, Junio C Hamano wrote:

Show 7 quoted lines

> Francis Daly <francis@daoine.org> 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.

-- 
Francis Daly        francis@daoine.org