Merge /pub/scm/git/git to recover lost side branch

diff --git a/Documentation/git-ls-tree.txt b/Documentation/git-ls-tree.txt
index 958b56d8f408e5a351c358197a9f5ab9eb986454..ba0438e9ad444d3647af192f3483f27a73f8e294 100644 (file)
--- a/Documentation/git-ls-tree.txt
+++ b/Documentation/git-ls-tree.txt
@@ -1,6 +1,5 @@
 git-ls-tree(1)
 ==============
-v0.1, May 2005
 
 NAME
 ----
@@ -19,7 +18,7 @@ in the current working directory.
 OPTIONS
 -------
 <tree-ish>::
-       Id of a tree.
+       Id of a tree-ish.
 
 -d::
        show only the named tree entry itself, not its children
@@ -31,7 +30,7 @@ OPTIONS
        \0 line termination on output
 
 paths::
-       When paths are given, shows them.  Otherwise implicitly
+       When paths are given, show them.  Otherwise implicitly
        uses the root level of the tree as the sole path argument.
 
 
@@ -39,6 +38,10 @@ Output Format
 -------------
         <mode> SP <type> SP <object> TAB <file>
 
+When `-z` option is not used, TAB, LF, and backslash characters
+in pathnames are represented as `\t`, `\n`, and `\\`,
+respectively.
+
 
 Author
 ------
@@ -51,5 +54,5 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 
 GIT
 ---
-Part of the link:git.html[git] suite
+Part of the gitlink:git[7] suite