Merge branch 'mm/status-without-comment-char'

diff --git a/po/de.po b/po/de.po
index f4076fb633ca970f22281a6ff98c229587945c69..35a44b94630e2d90d9cdbf819b4a354e2d368cd0 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -4684,8 +4684,8 @@ msgid "print sizes in human readable format"
 msgstr "gibt Größenangaben in menschenlesbaren Format aus"
 
 #: builtin/describe.c:16
-msgid "git describe [options] <committish>*"
-msgstr "git describe [Optionen] <committish>*"
+msgid "git describe [options] <commit-ish>*"
+msgstr "git describe [Optionen] <commit-ish>*"
 
 #: builtin/describe.c:17
 msgid "git describe [options] --dirty"
@@ -4822,7 +4822,7 @@ msgid "No names found, cannot describe anything."
 msgstr "Keine Namen gefunden, kann nichts beschreiben."
 
 #: builtin/describe.c:489
-msgid "--dirty is incompatible with committishes"
+msgid "--dirty is incompatible with commit-ishes"
 msgstr "Die Option --dirty kann nicht mit Commits verwendet werden."
 
 #: builtin/diff.c:79