Merge branch 'maint'

diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt
index 42ca059908b6af5726d958d92912705c96235d29..44a2ef1de15bdce5d67a151a1cb6150031e57c7e 100644 (file)
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@ -269,7 +269,7 @@ endif::git-rev-list[]
 
        Pretend as if all the refs in `refs/remotes` are listed
        on the command line as '<commit>'. If '<pattern>' is given, limit
-       remote tracking branches to ones matching given shell glob.
+       remote-tracking branches to ones matching given shell glob.
        If pattern lacks '?', '*', or '[', '/*' at the end is implied.
 
 --glob=<glob-pattern>::