Merge branch 'master' into next

diff --git a/Documentation/git-ls-tree.txt b/Documentation/git-ls-tree.txt
index 7e072b53761c058939e0350435a75be6720a8f20..f283bacb6557fe7c1313912402f60e3a1560d04a 100644 (file)
--- a/Documentation/git-ls-tree.txt
+++ b/Documentation/git-ls-tree.txt
@@ -49,7 +49,7 @@ OPTIONS
        Non default number of digits can be specified with --abbrev=<n>.
 
 --full-name::
-       Instead of showing the path names relative the current working
+       Instead of showing the path names relative to the current working
        directory, show the full path names.
 
 paths::