Merge branch 'jc/clean' into next

diff --git a/Documentation/tutorial.txt b/Documentation/tutorial.txt
index a09bbea7d7214bbbb02ed1c6013a38b753c80ad6..fa79b016c77a7f37ae1e289eb42bb008174eda81 100644 (file)
--- a/Documentation/tutorial.txt
+++ b/Documentation/tutorial.txt
@@ -18,7 +18,7 @@ Assume you have a tarball project.tar.gz with your initial work.  You
 can place it under git revision control as follows.
 
 ------------------------------------------------
-$ tar -xzf project.tar.gz
+$ tar xzf project.tar.gz
 $ cd project
 $ git init-db
 ------------------------------------------------
@@ -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