ls-tree: chomp leading directories when run from a subdirectory

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 482eba7eba29b2bad53380a1eba4c4aa16083fab..5f068c2a1ab225755a443f6a34e3c4797481cd16 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -297,9 +297,6 @@ gitlink:git-merge[1]::
 gitlink:git-mv[1]::
        Move or rename a file, a directory, or a symlink.
 
-gitlink:git-octopus[1]::
-       Merge more than two commits.
-
 gitlink:git-pull[1]::
        Fetch from and merge with a remote repository.