Merge branch 'sp/emfile'

diff --git a/Documentation/git-describe.txt b/Documentation/git-describe.txt
index 7ef9d51577594ae6a27f71bae251d6ee2f52befa..02e015ad9c41e760b3ab37d2c5a9e4ef9ef0c4f5 100644 (file)
--- a/Documentation/git-describe.txt
+++ b/Documentation/git-describe.txt
@@ -37,7 +37,7 @@ OPTIONS
 --all::
        Instead of using only the annotated tags, use any ref
        found in `.git/refs/`.  This option enables matching
-       any known branch, remote branch, or lightweight tag.
+       any known branch, remote-tracking branch, or lightweight tag.
 
 --tags::
        Instead of using only the annotated tags, use any tag