Merge branch 'tz/maint-rpm' into maint

diff --git a/Documentation/git-describe.txt b/Documentation/git-describe.txt
index e9dbca7d87bade4126cd45477b69478894518168..2f979167819f0e4500b998b41092e18ef053cead 100644 (file)
--- a/Documentation/git-describe.txt
+++ b/Documentation/git-describe.txt
@@ -120,7 +120,7 @@ closest tagname without any suffix:
        tags/v1.0.0
 
 Note that the suffix you get if you type these commands today may be
-longer than what Linus saw above when he ran this command, as your
+longer than what Linus saw above when he ran these commands, as your
 git repository may have new commits whose object names begin with
 975b that did not exist back then, and "-g975b" suffix alone may not
 be sufficient to disambiguate these commits.