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 0d159fd5cc6c98a3bd4fe824c5f8a9a5b340fb28..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
 ----
@@ -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
 ------