Merge branch 'master' into next

diff --git a/Documentation/git-describe.txt b/Documentation/git-describe.txt
index 7a253eaf284ab8effc7138f91ba6236a4f05dfdd..2700f35bdb6ec7aae9520eca0d21bcf5089bc750 100644 (file)
--- a/Documentation/git-describe.txt
+++ b/Documentation/git-describe.txt
@@ -21,7 +21,7 @@ object name of the commit.
 OPTIONS
 -------
 <committish>::
-       The object name of the comittish. 
+       The object name of the committish.
 
 --all::
        Instead of using only the annotated tags, use any ref