summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Francis Daly <francis@daoine.org>2006-03-04 16:35:27 +0000
committerLibravatar Junio C Hamano <junkio@cox.net>2006-03-04 13:50:04 -0800
commit2eb063c9331d73548e0fe68802e73ccd68a41046 (patch)
tree23d98fbdab8a8a115882e20fca2c1eb0bca85424
parentgit.el: Added customize support for all parameters. (diff)
downloadtgif-2eb063c9331d73548e0fe68802e73ccd68a41046.tar.xz
AsciiDoc fix for tutorial
RE \^.+\^ becomes <sup>. Not wanted here Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--Documentation/tutorial.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/tutorial.txt b/Documentation/tutorial.txt
index 66680d76bd..fa79b016c7 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}{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