Merge branch 'maint'

diff --git a/po/fr.po b/po/fr.po
index 2cdb6f93a3b683ff4d25bdc711b330844e24d7d0..49e0ec14ab105dce3d457ae3898542cd146aecc9 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -4291,7 +4291,7 @@ msgid "print sizes in human readable format"
 msgstr ""
 
 #: builtin/describe.c:15
-msgid "git describe [options] <committish>*"
+msgid "git describe [options] <commit-ish>*"
 msgstr ""
 
 #: builtin/describe.c:16
@@ -4417,7 +4417,7 @@ msgid "No names found, cannot describe anything."
 msgstr ""
 
 #: builtin/describe.c:481
-msgid "--dirty is incompatible with committishes"
+msgid "--dirty is incompatible with commit-ishes"
 msgstr ""
 
 #: builtin/diff.c:79