diff --git a/po/documentation.de.po b/po/documentation.de.po
index 2a46dc3c740a9e38d5f4a83b8df1d110cb234da0..a4233892691399450324649b971473487160f1d9 100644
--- a/po/documentation.de.po
+++ b/po/documentation.de.po
@@ -6983,7 +6983,7 @@ msgstr "Dieser Befehl kann die folgenden Einsprungspunkte (hooks) aufrufen: `com
 
 #. type: Plain text
 #: en/git-am.txt:242
-#, priority:100
+#, ignore-same, priority:100
 msgid "linkgit:git-apply[1]."
 msgstr "linkgit:git-apply[1]."
 
@@ -7459,9 +7459,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-apply.txt:282
-#, priority:100
+#, ignore-same, priority:100
 msgid "linkgit:git-am[1]."
-msgstr "linkgit:git-add[1]."
+msgstr "linkgit:git-am[1]."
 
 #. type: Title =
 #: en/git-archimport.txt:2
@@ -10997,7 +10997,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-check-attr.txt:117
-#, priority:100
+#, ignore-same, priority:100
 msgid "linkgit:gitattributes[5]."
 msgstr "linkgit:gitattributes[5]."
 
@@ -31171,10 +31171,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-ls-remote.txt:114
-#, fuzzy, priority:100
-#| msgid "linkgit:git-check-ref-format[1]"
+#, ignore-same, priority:100
 msgid "linkgit:git-check-ref-format[1]."
-msgstr "linkgit:git-check-ref-format[1]"
+msgstr "linkgit:git-check-ref-format[1]."
 
 #. type: Title =
 #: en/git-ls-tree.txt:2
@@ -49006,10 +49005,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-submodule.txt:438
-#, fuzzy, priority:220
-#| msgid "linkgit:git-read-tree[1], linkgit:gitignore[5]"
+#, ignore-same, priority:220
 msgid "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
-msgstr "linkgit:git-read-tree[1], linkgit:gitignore[5]"
+msgstr "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
 
 #. type: Title =
 #: en/git-svn.txt:2
@@ -57407,10 +57405,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/pretty-formats.txt:132
-#, fuzzy, priority:260
-#| msgid "linkgit:git-shortlog[1]"
+#, ignore-same, priority:260
 msgid "linkgit:git-shortlog[1]."
-msgstr "linkgit:git-shortlog[1]"
+msgstr "linkgit:git-shortlog[1]."
 
 #. type: Labeled list
 #: en/pretty-formats.txt:132
diff --git a/po/documentation.es_MX.po b/po/documentation.es_MX.po
index 137d61f41560e41af6883726c5f04a59807afbfa..88f2925c479278759c453fb33e648f3c2e793d94 100644
--- a/po/documentation.es_MX.po
+++ b/po/documentation.es_MX.po
@@ -6891,9 +6891,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-am.txt:242
-#, fuzzy, priority:100
+#, ignore-same, priority:100
 msgid "linkgit:git-apply[1]."
-msgstr "linkgit:git-apply[1]"
+msgstr "linkgit:git-apply[1]."
 
 #. type: Title =
 #: en/git-annotate.txt:2
@@ -7361,9 +7361,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-apply.txt:282
-#, fuzzy, priority:100
+#, ignore-same, priority:100
 msgid "linkgit:git-am[1]."
-msgstr "linkgit:git-am[1]"
+msgstr "linkgit:git-am[1]."
 
 #. type: Title =
 #: en/git-archimport.txt:2
@@ -10806,9 +10806,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-check-attr.txt:117
-#, fuzzy, priority:100
+#, ignore-same, priority:100
 msgid "linkgit:gitattributes[5]."
-msgstr "linkgit:gitattributes[5]"
+msgstr "linkgit:gitattributes[5]."
 
 #. type: Title =
 #: en/git-check-ignore.txt:2
@@ -30482,9 +30482,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-ls-remote.txt:114
-#, fuzzy, priority:100
+#, ignore-same, priority:100
 msgid "linkgit:git-check-ref-format[1]."
-msgstr "linkgit:git-check-ref-format[1]"
+msgstr "linkgit:git-check-ref-format[1]."
 
 #. type: Title =
 #: en/git-ls-tree.txt:2
@@ -48090,9 +48090,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-submodule.txt:438
-#, priority:220
+#, ignore-same, priority:220
 msgid "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
-msgstr ""
+msgstr "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
 
 #. type: Title =
 #: en/git-svn.txt:2
@@ -56375,10 +56375,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/pretty-formats.txt:132
-#, fuzzy, priority:260
-#| msgid "linkgit:git-shortlog[1]"
+#, ignore-same, priority:260
 msgid "linkgit:git-shortlog[1]."
-msgstr "linkgit:git-shortlog[1]"
+msgstr "linkgit:git-shortlog[1]."
 
 #. type: Labeled list
 #: en/pretty-formats.txt:132
diff --git a/po/documentation.fr.po b/po/documentation.fr.po
index c39e1fb8af5c73be74ed22505cdb80c1fa982101..3744c71f8739a44e540bc012aab2fbb9a8cc71fd 100644
--- a/po/documentation.fr.po
+++ b/po/documentation.fr.po
@@ -6978,7 +6978,7 @@ msgstr "Cette commande peut lancer les crochets `applypatch-msg`, `pre-applypatc
 
 #. type: Plain text
 #: en/git-am.txt:242
-#, priority:100
+#, ignore-same, priority:100
 msgid "linkgit:git-apply[1]."
 msgstr "linkgit:git-apply[1]."
 
@@ -7448,7 +7448,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-apply.txt:282
-#, priority:100
+#, ignore-same, priority:100
 msgid "linkgit:git-am[1]."
 msgstr "linkgit:git-am[1]."
 
@@ -10901,7 +10901,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-check-attr.txt:117
-#, priority:100
+#, ignore-same, priority:100
 msgid "linkgit:gitattributes[5]."
 msgstr "linkgit:gitattributes[5]."
 
@@ -30797,7 +30797,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-ls-remote.txt:114
-#, priority:100
+#, ignore-same, priority:100
 msgid "linkgit:git-check-ref-format[1]."
 msgstr "linkgit:git-check-ref-format[1]."
 
@@ -48655,9 +48655,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-submodule.txt:438
-#, fuzzy, priority:220
+#, ignore-same, priority:220
 msgid "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
-msgstr "git-add(1)"
+msgstr "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
 
 #. type: Title =
 #: en/git-svn.txt:2
@@ -57083,7 +57083,7 @@ msgstr "basculer les retours à la ligne, à l'instar de l'option-w de"
 
 #. type: Plain text
 #: en/pretty-formats.txt:132
-#, 260, priority
+#, ignore-same, priority:260
 msgid "linkgit:git-shortlog[1]."
 msgstr "linkgit:git-shortlog[1]."
 
diff --git a/po/documentation.nb_NO.po b/po/documentation.nb_NO.po
index 3f998790a8dcfedfdc1f22149b536712ac82cdff..d6e321314be5a558852c937ccc429fc4e66514d2 100644
--- a/po/documentation.nb_NO.po
+++ b/po/documentation.nb_NO.po
@@ -6846,9 +6846,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-am.txt:242
-#, priority:100
+#, ignore-same, priority:100
 msgid "linkgit:git-apply[1]."
-msgstr ""
+msgstr "linkgit:git-apply[1]."
 
 #. type: Title =
 #: en/git-annotate.txt:2
@@ -7316,9 +7316,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-apply.txt:282
-#, priority:100
+#, ignore-same, priority:100
 msgid "linkgit:git-am[1]."
-msgstr ""
+msgstr "linkgit:git-am[1]."
 
 #. type: Title =
 #: en/git-archimport.txt:2
@@ -10761,9 +10761,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-check-attr.txt:117
-#, priority:100
+#, ignore-same, priority:100
 msgid "linkgit:gitattributes[5]."
-msgstr ""
+msgstr "linkgit:gitattributes[5]."
 
 #. type: Title =
 #: en/git-check-ignore.txt:2
@@ -30434,9 +30434,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-ls-remote.txt:114
-#, priority:100
+#, ignore-same, priority:100
 msgid "linkgit:git-check-ref-format[1]."
-msgstr ""
+msgstr "linkgit:git-check-ref-format[1]."
 
 #. type: Title =
 #: en/git-ls-tree.txt:2
@@ -48037,9 +48037,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-submodule.txt:438
-#, priority:220
+#, ignore-same, priority:220
 msgid "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
-msgstr ""
+msgstr "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
 
 #. type: Title =
 #: en/git-svn.txt:2
@@ -56321,10 +56321,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/pretty-formats.txt:132
-#, fuzzy, priority:260
-#| msgid "linkgit:git-shortlog[1]"
+#, ignore-same, priority:260
 msgid "linkgit:git-shortlog[1]."
-msgstr "linkgit:git-shortlog[1]"
+msgstr "linkgit:git-shortlog[1]."
 
 #. type: Labeled list
 #: en/pretty-formats.txt:132
diff --git a/po/documentation.pot b/po/documentation.pot
index 4c5ad2fdd4640f882a058d97f0c51261171156d1..c35492b54cb499c4632821abd4346473d4a690d5 100644
--- a/po/documentation.pot
+++ b/po/documentation.pot
@@ -6846,9 +6846,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-am.txt:242
-#, priority:100
+#, ignore-same, priority:100
 msgid "linkgit:git-apply[1]."
-msgstr ""
+msgstr "linkgit:git-apply[1]."
 
 #. type: Title =
 #: en/git-annotate.txt:2
@@ -7316,9 +7316,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-apply.txt:282
-#, priority:100
+#, ignore-same, priority:100
 msgid "linkgit:git-am[1]."
-msgstr ""
+msgstr "linkgit:git-am[1]."
 
 #. type: Title =
 #: en/git-archimport.txt:2
@@ -10761,9 +10761,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-check-attr.txt:117
-#, priority:100
+#, ignore-same, priority:100
 msgid "linkgit:gitattributes[5]."
-msgstr ""
+msgstr "linkgit:gitattributes[5]."
 
 #. type: Title =
 #: en/git-check-ignore.txt:2
@@ -30433,9 +30433,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-ls-remote.txt:114
-#, priority:100
+#, ignore-same, priority:100
 msgid "linkgit:git-check-ref-format[1]."
-msgstr ""
+msgstr "linkgit:git-check-ref-format[1]."
 
 #. type: Title =
 #: en/git-ls-tree.txt:2
@@ -48034,9 +48034,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-submodule.txt:438
-#, priority:220
+#, ignore-same, priority:220
 msgid "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
-msgstr ""
+msgstr "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
 
 #. type: Title =
 #: en/git-svn.txt:2
@@ -56310,9 +56310,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/pretty-formats.txt:132
-#, priority:260
+#, ignore-same, priority:260
 msgid "linkgit:git-shortlog[1]."
-msgstr ""
+msgstr "linkgit:git-shortlog[1]."
 
 #. type: Labeled list
 #: en/pretty-formats.txt:132
diff --git a/po/documentation.pt_BR.po b/po/documentation.pt_BR.po
index 39d676e58c4273a1ddf3cef7b85c1e5ad0c37926..eda158356544618b85a43e67b2468e3df8f91fbb 100644
--- a/po/documentation.pt_BR.po
+++ b/po/documentation.pt_BR.po
@@ -7015,9 +7015,9 @@ msgstr "Este comando pode executar os ganchos `applypatch-msg`,` pre-applypatch`
 
 #. type: Plain text
 #: en/git-am.txt:242
-#, priority:100
+#, ignore-same, priority:100
 msgid "linkgit:git-apply[1]."
-msgstr "linkgit:git-aplicar1]."
+msgstr "linkgit:git-apply[1]."
 
 #. type: Title =
 #: en/git-annotate.txt:2
@@ -7497,7 +7497,7 @@ msgstr "Se `--index` não for especificado, os submódulos confirmados no patch
 
 #. type: Plain text
 #: en/git-apply.txt:282
-#, priority:100
+#, ignore-same, priority:100
 msgid "linkgit:git-am[1]."
 msgstr "linkgit:git-am[1]."
 
@@ -11020,9 +11020,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-check-attr.txt:117
-#, priority:100
+#, ignore-same, priority:100
 msgid "linkgit:gitattributes[5]."
-msgstr "linkgit:gitatributos[5]."
+msgstr "linkgit:gitattributes[5]."
 
 #. type: Title =
 #: en/git-check-ignore.txt:2
@@ -30804,9 +30804,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-ls-remote.txt:114
-#, priority:100
+#, ignore-same, priority:100
 msgid "linkgit:git-check-ref-format[1]."
-msgstr ""
+msgstr "linkgit:git-check-ref-format[1]."
 
 #. type: Title =
 #: en/git-ls-tree.txt:2
@@ -48440,9 +48440,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-submodule.txt:438
-#, priority:220
+#, ignore-same, priority:220
 msgid "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
-msgstr ""
+msgstr "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
 
 #. type: Title =
 #: en/git-svn.txt:2
@@ -56760,10 +56760,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/pretty-formats.txt:132
-#, fuzzy, priority:260
-#| msgid "linkgit:git-shortlog[1]"
+#, ignore-same, priority:260
 msgid "linkgit:git-shortlog[1]."
-msgstr "linkgit:git-shortlog[1]"
+msgstr "linkgit:git-shortlog[1]."
 
 #. type: Labeled list
 #: en/pretty-formats.txt:132
diff --git a/po/documentation.pt_PT.po b/po/documentation.pt_PT.po
index ea2511fb5e7f23caedbf48061a51670a9d9c3ccb..78c674314f3931938c373b3dc4cf8142574e2386 100644
--- a/po/documentation.pt_PT.po
+++ b/po/documentation.pt_PT.po
@@ -6845,9 +6845,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-am.txt:242
-#, fuzzy, priority:100
+#, ignore-same, priority:100
 msgid "linkgit:git-apply[1]."
-msgstr "linkgit:git-apply[1]"
+msgstr "linkgit:git-apply[1]."
 
 #. type: Title =
 #: en/git-annotate.txt:2
@@ -7315,9 +7315,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-apply.txt:282
-#, fuzzy, priority:100
+#, ignore-same, priority:100
 msgid "linkgit:git-am[1]."
-msgstr "linkgit:git-am[1]"
+msgstr "linkgit:git-am[1]."
 
 #. type: Title =
 #: en/git-archimport.txt:2
@@ -10760,9 +10760,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-check-attr.txt:117
-#, fuzzy, priority:100
+#, ignore-same, priority:100
 msgid "linkgit:gitattributes[5]."
-msgstr "linkgit:gitattributes[5]"
+msgstr "linkgit:gitattributes[5]."
 
 #. type: Title =
 #: en/git-check-ignore.txt:2
@@ -30432,9 +30432,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-ls-remote.txt:114
-#, fuzzy, priority:100
+#, ignore-same, priority:100
 msgid "linkgit:git-check-ref-format[1]."
-msgstr "linkgit:git-check-ref-format[1]"
+msgstr "linkgit:git-check-ref-format[1]."
 
 #. type: Title =
 #: en/git-ls-tree.txt:2
@@ -48033,9 +48033,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-submodule.txt:438
-#, priority:220
+#, ignore-same, priority:220
 msgid "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
-msgstr ""
+msgstr "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
 
 #. type: Title =
 #: en/git-svn.txt:2
@@ -56309,9 +56309,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/pretty-formats.txt:132
-#, fuzzy, priority:260
+#, ignore-same, priority:260
 msgid "linkgit:git-shortlog[1]."
-msgstr "linkgit:git-shortlog[1]"
+msgstr "linkgit:git-shortlog[1]."
 
 #. type: Labeled list
 #: en/pretty-formats.txt:132
diff --git a/po/documentation.ru.po b/po/documentation.ru.po
index bdd4442288116c5dd7503ef0243818fe88a8dd41..45a6dc159eeb04a83e49d036e8bff815ac855119 100644
--- a/po/documentation.ru.po
+++ b/po/documentation.ru.po
@@ -6856,9 +6856,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-am.txt:242
-#, fuzzy, priority:100
+#, ignore-same, priority:100
 msgid "linkgit:git-apply[1]."
-msgstr "linkgit:git-apply[1]"
+msgstr "linkgit:git-apply[1]."
 
 #. type: Title =
 #: en/git-annotate.txt:2
@@ -7326,9 +7326,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-apply.txt:282
-#, fuzzy, priority:100
+#, ignore-same, priority:100
 msgid "linkgit:git-am[1]."
-msgstr "linkgit:git-am[1]"
+msgstr "linkgit:git-am[1]."
 
 #. type: Title =
 #: en/git-archimport.txt:2
@@ -10771,9 +10771,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-check-attr.txt:117
-#, fuzzy, priority:100
+#, ignore-same, priority:100
 msgid "linkgit:gitattributes[5]."
-msgstr "linkgit:gitattributes[5]"
+msgstr "linkgit:gitattributes[5]."
 
 #. type: Title =
 #: en/git-check-ignore.txt:2
@@ -30447,9 +30447,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-ls-remote.txt:114
-#, fuzzy, priority:100
+#, ignore-same, priority:100
 msgid "linkgit:git-check-ref-format[1]."
-msgstr "linkgit:git-check-ref-format[1]"
+msgstr "linkgit:git-check-ref-format[1]."
 
 #. type: Title =
 #: en/git-ls-tree.txt:2
@@ -48055,9 +48055,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-submodule.txt:438
-#, priority:220
+#, ignore-same, priority:220
 msgid "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
-msgstr ""
+msgstr "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
 
 #. type: Title =
 #: en/git-svn.txt:2
@@ -56340,10 +56340,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/pretty-formats.txt:132
-#, fuzzy, priority:260
-#| msgid "linkgit:git-shortlog[1]"
+#, ignore-same, priority:260
 msgid "linkgit:git-shortlog[1]."
-msgstr "linkgit:git-shortlog[1]"
+msgstr "linkgit:git-shortlog[1]."
 
 #. type: Labeled list
 #: en/pretty-formats.txt:132
diff --git a/po/documentation.zh_HANT.po b/po/documentation.zh_HANT.po
index 8ae1a0a26e70b2ed95ee62068443cae4b94c55cb..d28a1357814e29e6ef8f00219942fbc04604d177 100644
--- a/po/documentation.zh_HANT.po
+++ b/po/documentation.zh_HANT.po
@@ -6404,9 +6404,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-am.txt:237
-#, priority:100
+#, ignore-same, priority:100
 msgid "linkgit:git-apply[1]."
-msgstr ""
+msgstr "linkgit:git-apply[1]."
 
 #. type: Title =
 #: en/git-annotate.txt:2
@@ -6868,9 +6868,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-apply.txt:282
-#, priority:100
+#, ignore-same, priority:100
 msgid "linkgit:git-am[1]."
-msgstr ""
+msgstr "linkgit:git-am[1]."
 
 #. type: Title =
 #: en/git-archimport.txt:2
@@ -10260,9 +10260,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-check-attr.txt:117
-#, priority:100
+#, ignore-same, priority:100
 msgid "linkgit:gitattributes[5]."
-msgstr ""
+msgstr "linkgit:gitattributes[5]."
 
 #. type: Title =
 #: en/git-check-ignore.txt:2
@@ -29810,9 +29810,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-ls-remote.txt:114
-#, priority:100
+#, ignore-same, priority:100
 msgid "linkgit:git-check-ref-format[1]."
-msgstr ""
+msgstr "linkgit:git-check-ref-format[1]."
 
 #. type: Title =
 #: en/git-ls-tree.txt:2
@@ -47143,9 +47143,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-submodule.txt:426
-#, priority:220
+#, ignore-same, priority:220
 msgid "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
-msgstr ""
+msgstr "linkgit:gitsubmodules[7], linkgit:gitmodules[5]."
 
 #. type: Title =
 #: en/git-svn.txt:2
diff --git a/scripts/pre-translate-po b/scripts/pre-translate-po
index 6cc0f203e486b6111571021b55c7b642601fad70..381c5ab466868e653798a509cca22d2a0c24cc1d 100755
--- a/scripts/pre-translate-po
+++ b/scripts/pre-translate-po
@@ -7,7 +7,7 @@ import sys
 def main (f, d=None):
     po = polib.pofile(f, wrapwidth=0)
     option_re = re.compile(r'-[-a-z0-9[\]]+')
-    linkgit_re = re.compile(r'((linkgit:)?(git[-a-z0-9[\]]+|mail)(\[[157]\]|\([157]\))(,|;)?(\n| )?)+')
+    linkgit_re = re.compile(r'((linkgit:)?(git[-a-z0-9[\]]+|mail)(\[[157]\]|\([157]\))(,|;)?(\n| )?)+\.?')
     quoted_re = re.compile(r'(`[a-zA-Z-_]+`(, )?)+|\'(oneline|short|medium|full(er)?|email|raw|(un)?set|unspecified|init|fetch|clone|rebase|dcommit|branch|tag|log|blame|find-rev|set-tree|(create|show)-ignore|mkdirs|commit-diff)\'|(user|transfer|submodule|stash|status|splitIndex|showbranch|sendemail|repack|remote|receive|push|merge(tool)?|mailinfo|log|interactive|instaweb|i18n|help|gui|gitweb|fastimport|format|fetch|diff(tool)?|credential|commit|column|core|branch|apply|color|git-p4)\.[a-zA-Z_.]+|araxis|bc3?|codecompare|deltawalker|guiffy|meld|diff(use|merge)|(exam|g?vim|t?k|open|xx)?diff[23]?|(ec?|p4|s|tortoise|win)merge|update|create|delete|verify|option|resolve|recursive|octopus|ours|subtree|theirs|patience|diff-algorithm=\[[a-z\|]+\]|ignore-(space-change|all-space|(cr|space)-at-eol)|(no-)?renormalize|no-renames|no|default|plain|blocks|(dimmed-)?zebra|allow-indentation-change|color|porcelain|none|list|(un)?lock|(re)?move|prune')
     env_var_re = re.compile(r'`?GIT_[A-Z_\d]+`?')
     if not d is None: