diff --git a/po/documentation.fr.po b/po/documentation.fr.po
index fb713b9912266cf55010c82182410795515e025b..9eadae8d2d3028a5323978458e0cf52a8e33b9e8 100644
--- a/po/documentation.fr.po
+++ b/po/documentation.fr.po
@@ -13495,7 +13495,7 @@ msgstr ""
#. type: Labeled list
#: en/git-add.txt:328
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "diff"
msgstr "diff"
diff --git a/po/documentation.tr.po b/po/documentation.tr.po
index 3ba1426783f4ce0f473cba2ea9b63c6d76692de9..211e0462c062ceb6674baf3cd117902317793aa8 100644
--- a/po/documentation.tr.po
+++ b/po/documentation.tr.po
@@ -19,7 +19,7 @@ msgstr ""
#: en/blame-options.txt:1 en/diff-options.txt:525 en/git-instaweb.txt:44
#: en/git-mailinfo.txt:47 en/git-mailsplit.txt:35 en/git-repack.txt:116
#: en/git-status.txt:31 en/git-submodule.txt:279
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "-b"
msgstr "-b"
@@ -33,7 +33,7 @@ msgstr ""
#. type: Labeled list
#: en/blame-options.txt:5 en/git-diff-tree.txt:45 en/git-format-patch.txt:279
#: en/git-fsck.txt:38 en/git-rebase.txt:415
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--root"
msgstr "--root"
@@ -46,7 +46,7 @@ msgstr ""
#. type: Labeled list
#: en/blame-options.txt:9
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--show-stats"
msgstr "--show-stats"
@@ -86,7 +86,7 @@ msgstr ""
#: en/git-checkout.txt:174 en/git-clone.txt:44 en/git-config.txt:159
#: en/git-grep.txt:176 en/git-instaweb.txt:23 en/git-ls-tree.txt:51
#: en/git-repack.txt:61 en/git-svn.txt:228 en/git-var.txt:20
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "-l"
msgstr "-l"
@@ -100,7 +100,7 @@ msgstr ""
#: en/git-cat-file.txt:36 en/git-checkout.txt:155 en/git-diff-tree.txt:42
#: en/git-http-fetch.txt:29 en/git-ls-files.txt:112 en/git-ls-remote.txt:26
#: en/git-ls-tree.txt:47 en/git-svn.txt:296 en/rev-list-options.txt:890
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "-t"
msgstr "-t"
@@ -144,14 +144,14 @@ msgstr ""
#: en/git-grep.txt:222 en/git-instaweb.txt:40 en/git-merge-file.txt:63
#: en/git-rebase.txt:383 en/git-request-pull.txt:29 en/git-svn.txt:504
#: en/git-svn.txt:641 en/git.txt:591
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "-p"
msgstr "-p"
#. type: Labeled list
#: en/blame-options.txt:40 en/git-commit.txt:109 en/git-push.txt:121
#: en/git-worktree.txt:115
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--porcelain"
msgstr "--porcelain"
@@ -162,7 +162,7 @@ msgstr ""
#. type: Labeled list
#: en/blame-options.txt:43
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--line-porcelain"
msgstr "--line-porcelain"
@@ -175,7 +175,7 @@ msgstr ""
#. type: Labeled list
#: en/blame-options.txt:48 en/git-pack-objects.txt:123 en/git-svn.txt:357
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--incremental"
msgstr "--incremental"
@@ -232,7 +232,7 @@ msgstr ""
#. type: Labeled list
#: en/blame-options.txt:73 en/git-checkout.txt:110 en/git-fsck.txt:92
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]progress"
msgstr "--[no-]progress"
@@ -301,7 +301,7 @@ msgstr ""
#. type: Labeled list
#: en/blame-options.txt:113 en/git-archimport.txt:70 en/git-cvsimport.txt:184
#: en/git-cvsserver.txt:48 en/git-grep.txt:141 en/git-ls-remote.txt:24
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "-h"
msgstr "-h"
@@ -312,7 +312,7 @@ msgstr ""
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:1 en/git-blame.txt:234
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-annotate[1]"
msgstr "linkgit:git-annotate[1]"
@@ -323,7 +323,7 @@ msgstr ""
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:4 en/git-annotate.txt:31
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-blame[1]"
msgstr "linkgit:git-blame[1]"
@@ -334,7 +334,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:7
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-cherry[1]"
msgstr "linkgit:git-cherry[1]"
@@ -345,7 +345,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:10
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-count-objects[1]"
msgstr "linkgit:git-count-objects[1]"
@@ -356,7 +356,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:13
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-difftool[1]"
msgstr "linkgit:git-difftool[1]"
@@ -367,7 +367,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:16
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-fsck[1]"
msgstr "linkgit:git-fsck[1]"
@@ -378,7 +378,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:19
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-get-tar-commit-id[1]"
msgstr "linkgit:git-get-tar-commit-id[1]"
@@ -389,7 +389,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:22
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-help[1]"
msgstr "linkgit:git-help[1]"
@@ -400,7 +400,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:25
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-instaweb[1]"
msgstr "linkgit:git-instaweb[1]"
@@ -411,7 +411,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:28
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-merge-tree[1]"
msgstr "linkgit:git-merge-tree[1]"
@@ -422,7 +422,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:31
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-rerere[1]"
msgstr "linkgit:git-rerere[1]"
@@ -433,7 +433,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:34
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-rev-parse[1]"
msgstr "linkgit:git-rev-parse[1]"
@@ -444,7 +444,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:37
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-show-branch[1]"
msgstr "linkgit:git-show-branch[1]"
@@ -455,7 +455,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:40
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-verify-commit[1]"
msgstr "linkgit:git-verify-commit[1]"
@@ -466,7 +466,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:43
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-verify-tag[1]"
msgstr "linkgit:git-verify-tag[1]"
@@ -477,7 +477,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:46
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-whatchanged[1]"
msgstr "linkgit:git-whatchanged[1]"
@@ -488,7 +488,7 @@ msgstr ""
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:49 en/git-instaweb.txt:90
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:gitweb[1]"
msgstr "linkgit:gitweb[1]"
@@ -499,7 +499,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:1 en/git-difftool.txt:142
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-config[1]"
msgstr "linkgit:git-config[1]"
@@ -510,7 +510,7 @@ msgstr ""
#. type: Plain text
#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1472
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-fast-export[1]"
msgstr "linkgit:git-fast-export[1]"
@@ -521,7 +521,7 @@ msgstr ""
#. type: Plain text
#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:215
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-fast-import[1]"
msgstr "linkgit:git-fast-import[1]"
@@ -532,7 +532,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:10
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-filter-branch[1]"
msgstr "linkgit:git-filter-branch[1]"
@@ -543,7 +543,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:13 en/git-difftool.txt:139
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-mergetool[1]"
msgstr "linkgit:git-mergetool[1]"
@@ -554,7 +554,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:16
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-pack-refs[1]"
msgstr "linkgit:git-pack-refs[1]"
@@ -565,7 +565,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:19
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-prune[1]"
msgstr "linkgit:git-prune[1]"
@@ -576,7 +576,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:22
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-reflog[1]"
msgstr "linkgit:git-reflog[1]"
@@ -587,7 +587,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:25
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-remote[1]"
msgstr "linkgit:git-remote[1]"
@@ -598,7 +598,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:28
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-repack[1]"
msgstr "linkgit:git-repack[1]"
@@ -609,7 +609,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:31
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-replace[1]"
msgstr "linkgit:git-replace[1]"
@@ -620,7 +620,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:1
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-archimport[1]"
msgstr "linkgit:git-archimport[1]"
@@ -631,7 +631,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:4
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-cvsexportcommit[1]"
msgstr "linkgit:git-cvsexportcommit[1]"
@@ -642,7 +642,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:7
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-cvsimport[1]"
msgstr "linkgit:git-cvsimport[1]"
@@ -653,7 +653,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:10
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-cvsserver[1]"
msgstr "linkgit:git-cvsserver[1]"
@@ -664,7 +664,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:13
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-imap-send[1]"
msgstr "linkgit:git-imap-send[1]"
@@ -675,7 +675,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:16
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-p4[1]"
msgstr "linkgit:git-p4[1]"
@@ -686,7 +686,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:19
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-quiltimport[1]"
msgstr "linkgit:git-quiltimport[1]"
@@ -697,7 +697,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:22
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-request-pull[1]"
msgstr "linkgit:git-request-pull[1]"
@@ -708,7 +708,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:25
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-send-email[1]"
msgstr "linkgit:git-send-email[1]"
@@ -719,7 +719,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:28
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-svn[1]"
msgstr "linkgit:git-svn[1]"
@@ -730,7 +730,7 @@ msgstr ""
#. type: Plain text
#: en/cmds-mainporcelain.txt:1 en/git-rm.txt:185
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-add[1]"
msgstr "linkgit:git-add[1]"
@@ -741,7 +741,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:4
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-am[1]"
msgstr "linkgit:git-am[1]"
@@ -752,7 +752,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:7
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-archive[1]"
msgstr "linkgit:git-archive[1]"
@@ -763,7 +763,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:10
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-bisect[1]"
msgstr "linkgit:git-bisect[1]"
@@ -774,7 +774,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:13
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-branch[1]"
msgstr "linkgit:git-branch[1]"
@@ -785,7 +785,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:16
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-bundle[1]"
msgstr "linkgit:git-bundle[1]"
@@ -796,7 +796,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:19
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-checkout[1]"
msgstr "linkgit:git-checkout[1]"
@@ -807,7 +807,7 @@ msgstr ""
#. type: Plain text
#: en/cmds-mainporcelain.txt:22 en/git-revert.txt:126
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-cherry-pick[1]"
msgstr "linkgit:git-cherry-pick[1]"
@@ -818,7 +818,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:25
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-citool[1]"
msgstr "linkgit:git-citool[1]"
@@ -829,7 +829,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:28
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-clean[1]"
msgstr "linkgit:git-clean[1]"
@@ -840,7 +840,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:31
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-clone[1]"
msgstr "linkgit:git-clone[1]"
@@ -851,7 +851,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:34
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-commit[1]"
msgstr "linkgit:git-commit[1]"
@@ -862,7 +862,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:37
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-describe[1]"
msgstr "linkgit:git-describe[1]"
@@ -873,7 +873,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:40 en/git-difftool.txt:136
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-diff[1]"
msgstr "linkgit:git-diff[1]"
@@ -884,7 +884,7 @@ msgstr ""
#. type: Plain text
#: en/cmds-mainporcelain.txt:43 en/git-fetch-pack.txt:129
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-fetch[1]"
msgstr "linkgit:git-fetch[1]"
@@ -895,7 +895,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:46
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-format-patch[1]"
msgstr "linkgit:git-format-patch[1]"
@@ -906,7 +906,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:49
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-gc[1]"
msgstr "linkgit:git-gc[1]"
@@ -917,7 +917,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:52
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-grep[1]"
msgstr "linkgit:git-grep[1]"
@@ -928,7 +928,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:55
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-gui[1]"
msgstr "linkgit:git-gui[1]"
@@ -939,7 +939,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:58
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-init[1]"
msgstr "linkgit:git-init[1]"
@@ -950,7 +950,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:61
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-log[1]"
msgstr "linkgit:git-log[1]"
@@ -961,7 +961,7 @@ msgstr ""
#. type: Plain text
#: en/cmds-mainporcelain.txt:64 en/git-fmt-merge-msg.txt:75
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-merge[1]"
msgstr "linkgit:git-merge[1]"
@@ -972,7 +972,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:67
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-mv[1]"
msgstr "linkgit:git-mv[1]"
@@ -983,7 +983,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:70
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-notes[1]"
msgstr "linkgit:git-notes[1]"
@@ -994,7 +994,7 @@ msgstr ""
#. type: Plain text
#: en/cmds-mainporcelain.txt:73 en/git-fetch.txt:209
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-pull[1]"
msgstr "linkgit:git-pull[1]"
@@ -1005,7 +1005,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:76
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-push[1]"
msgstr "linkgit:git-push[1]"
@@ -1016,7 +1016,7 @@ msgstr ""
#. type: Plain text
#: en/cmds-mainporcelain.txt:79 en/git-svn.txt:1133
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-rebase[1]"
msgstr "linkgit:git-rebase[1]"
@@ -1027,7 +1027,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:82
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-reset[1]"
msgstr "linkgit:git-reset[1]"
@@ -1038,7 +1038,7 @@ msgstr ""
#. type: Plain text
#: en/cmds-mainporcelain.txt:85 en/git-cherry-pick.txt:230
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-revert[1]"
msgstr "linkgit:git-revert[1]"
@@ -1049,7 +1049,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:88
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-rm[1]"
msgstr "linkgit:git-rm[1]"
@@ -1060,7 +1060,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:91
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-shortlog[1]"
msgstr "linkgit:git-shortlog[1]"
@@ -1071,7 +1071,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:94
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-show[1]"
msgstr "linkgit:git-show[1]"
@@ -1082,7 +1082,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:97
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-stash[1]"
msgstr "linkgit:git-stash[1]"
@@ -1093,7 +1093,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:100
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-status[1]"
msgstr "linkgit:git-status[1]"
@@ -1104,7 +1104,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:103
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-submodule[1]"
msgstr "linkgit:git-submodule[1]"
@@ -1115,7 +1115,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:106
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-tag[1]"
msgstr "linkgit:git-tag[1]"
@@ -1126,7 +1126,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:109
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-worktree[1]"
msgstr "linkgit:git-worktree[1]"
@@ -1137,7 +1137,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:112 en/git-gui.txt:104
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:gitk[1]"
msgstr "linkgit:gitk[1]"
@@ -1148,7 +1148,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:1
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-cat-file[1]"
msgstr "linkgit:git-cat-file[1]"
@@ -1159,7 +1159,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:4
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-diff-files[1]"
msgstr "linkgit:git-diff-files[1]"
@@ -1170,7 +1170,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:7
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-diff-index[1]"
msgstr "linkgit:git-diff-index[1]"
@@ -1181,7 +1181,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:10
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-diff-tree[1]"
msgstr "linkgit:git-diff-tree[1]"
@@ -1192,7 +1192,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:13
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-for-each-ref[1]"
msgstr "linkgit:git-for-each-ref[1]"
@@ -1203,7 +1203,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:16
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-ls-files[1]"
msgstr "linkgit:git-ls-files[1]"
@@ -1214,7 +1214,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:19
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-ls-remote[1]"
msgstr "linkgit:git-ls-remote[1]"
@@ -1225,7 +1225,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:22
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-ls-tree[1]"
msgstr "linkgit:git-ls-tree[1]"
@@ -1236,7 +1236,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:25
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-merge-base[1]"
msgstr "linkgit:git-merge-base[1]"
@@ -1247,7 +1247,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:28
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-name-rev[1]"
msgstr "linkgit:git-name-rev[1]"
@@ -1258,7 +1258,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:31
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-pack-redundant[1]"
msgstr "linkgit:git-pack-redundant[1]"
@@ -1269,7 +1269,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:34
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-rev-list[1]"
msgstr "linkgit:git-rev-list[1]"
@@ -1280,7 +1280,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:37
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-show-index[1]"
msgstr "linkgit:git-show-index[1]"
@@ -1291,7 +1291,7 @@ msgstr ""
#. type: Plain text
#: en/cmds-plumbinginterrogators.txt:40 en/git-for-each-ref.txt:341
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-show-ref[1]"
msgstr "linkgit:git-show-ref[1]"
@@ -1302,7 +1302,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:43
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-unpack-file[1]"
msgstr "linkgit:git-unpack-file[1]"
@@ -1313,7 +1313,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:46
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-var[1]"
msgstr "linkgit:git-var[1]"
@@ -1324,7 +1324,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:49
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-verify-pack[1]"
msgstr "linkgit:git-verify-pack[1]"
@@ -1335,7 +1335,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:1
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-apply[1]"
msgstr "linkgit:git-apply[1]"
@@ -1346,7 +1346,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:4
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-checkout-index[1]"
msgstr "linkgit:git-checkout-index[1]"
@@ -1357,7 +1357,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:7
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-commit-tree[1]"
msgstr "linkgit:git-commit-tree[1]"
@@ -1368,7 +1368,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:10
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-hash-object[1]"
msgstr "linkgit:git-hash-object[1]"
@@ -1379,7 +1379,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:13
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-index-pack[1]"
msgstr "linkgit:git-index-pack[1]"
@@ -1390,7 +1390,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:16
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-merge-file[1]"
msgstr "linkgit:git-merge-file[1]"
@@ -1401,7 +1401,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:19
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-merge-index[1]"
msgstr "linkgit:git-merge-index[1]"
@@ -1412,7 +1412,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:22
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-mktag[1]"
msgstr "linkgit:git-mktag[1]"
@@ -1423,7 +1423,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:25
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-mktree[1]"
msgstr "linkgit:git-mktree[1]"
@@ -1434,7 +1434,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:28
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-pack-objects[1]"
msgstr "linkgit:git-pack-objects[1]"
@@ -1445,7 +1445,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:31
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-prune-packed[1]"
msgstr "linkgit:git-prune-packed[1]"
@@ -1456,7 +1456,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:34
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-read-tree[1]"
msgstr "linkgit:git-read-tree[1]"
@@ -1467,7 +1467,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:37
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-symbolic-ref[1]"
msgstr "linkgit:git-symbolic-ref[1]"
@@ -1478,7 +1478,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:40
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-unpack-objects[1]"
msgstr "linkgit:git-unpack-objects[1]"
@@ -1489,7 +1489,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:43
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-update-index[1]"
msgstr "linkgit:git-update-index[1]"
@@ -1500,7 +1500,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:46
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-update-ref[1]"
msgstr "linkgit:git-update-ref[1]"
@@ -1511,7 +1511,7 @@ msgstr ""
#. type: Plain text
#: en/cmds-plumbingmanipulators.txt:49 en/git-commit-tree.txt:115
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-write-tree[1]"
msgstr "linkgit:git-write-tree[1]"
@@ -1522,7 +1522,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:1
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-check-attr[1]"
msgstr "linkgit:git-check-attr[1]"
@@ -1533,7 +1533,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:4
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-check-ignore[1]"
msgstr "linkgit:git-check-ignore[1]"
@@ -1544,7 +1544,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:7
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-check-mailmap[1]"
msgstr "linkgit:git-check-mailmap[1]"
@@ -1555,7 +1555,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:10
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-check-ref-format[1]"
msgstr "linkgit:git-check-ref-format[1]"
@@ -1566,7 +1566,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:13
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-column[1]"
msgstr "linkgit:git-column[1]"
@@ -1577,7 +1577,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:16
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-credential[1]"
msgstr "linkgit:git-credential[1]"
@@ -1588,7 +1588,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:19
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-credential-cache[1]"
msgstr "linkgit:git-credential-cache[1]"
@@ -1599,7 +1599,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:22
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-credential-store[1]"
msgstr "linkgit:git-credential-store[1]"
@@ -1610,7 +1610,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:25
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-fmt-merge-msg[1]"
msgstr "linkgit:git-fmt-merge-msg[1]"
@@ -1621,7 +1621,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:28
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-interpret-trailers[1]"
msgstr "linkgit:git-interpret-trailers[1]"
@@ -1632,7 +1632,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:31
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-mailinfo[1]"
msgstr "linkgit:git-mailinfo[1]"
@@ -1643,7 +1643,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:34
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-mailsplit[1]"
msgstr "linkgit:git-mailsplit[1]"
@@ -1654,7 +1654,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:37
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-merge-one-file[1]"
msgstr "linkgit:git-merge-one-file[1]"
@@ -1665,7 +1665,7 @@ msgstr ""
#. type: Plain text
#: en/cmds-purehelpers.txt:40 en/git-cherry.txt:142
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-patch-id[1]"
msgstr "linkgit:git-patch-id[1]"
@@ -1676,7 +1676,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:43
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-sh-i18n[1]"
msgstr "linkgit:git-sh-i18n[1]"
@@ -1687,7 +1687,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:46
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-sh-setup[1]"
msgstr "linkgit:git-sh-setup[1]"
@@ -1698,7 +1698,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-purehelpers.txt:49
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-stripspace[1]"
msgstr "linkgit:git-stripspace[1]"
@@ -1709,7 +1709,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-synchelpers.txt:1
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-http-fetch[1]"
msgstr "linkgit:git-http-fetch[1]"
@@ -1720,7 +1720,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-synchelpers.txt:4
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-http-push[1]"
msgstr "linkgit:git-http-push[1]"
@@ -1731,7 +1731,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-synchelpers.txt:7
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-parse-remote[1]"
msgstr "linkgit:git-parse-remote[1]"
@@ -1742,7 +1742,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-synchelpers.txt:10
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-receive-pack[1]"
msgstr "linkgit:git-receive-pack[1]"
@@ -1753,7 +1753,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-synchelpers.txt:13
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-shell[1]"
msgstr "linkgit:git-shell[1]"
@@ -1764,7 +1764,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-synchelpers.txt:16
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-upload-archive[1]"
msgstr "linkgit:git-upload-archive[1]"
@@ -1775,7 +1775,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-synchelpers.txt:19
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-upload-pack[1]"
msgstr "linkgit:git-upload-pack[1]"
@@ -1786,7 +1786,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-synchingrepositories.txt:1
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-daemon[1]"
msgstr "linkgit:git-daemon[1]"
@@ -1797,7 +1797,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-synchingrepositories.txt:4
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-fetch-pack[1]"
msgstr "linkgit:git-fetch-pack[1]"
@@ -1808,7 +1808,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-synchingrepositories.txt:7
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-http-backend[1]"
msgstr "linkgit:git-http-backend[1]"
@@ -1819,7 +1819,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-synchingrepositories.txt:10
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-send-pack[1]"
msgstr "linkgit:git-send-pack[1]"
@@ -1830,7 +1830,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-synchingrepositories.txt:13
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "linkgit:git-update-server-info[1]"
msgstr "linkgit:git-update-server-info[1]"
@@ -2013,7 +2013,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:105
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`gitdir`"
msgstr "`gitdir`"
@@ -2596,7 +2596,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:332
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.fileMode"
msgstr "core.fileMode"
@@ -2637,7 +2637,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:354
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.hideDotFiles"
msgstr "core.hideDotFiles"
@@ -2652,7 +2652,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:360
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.ignoreCase"
msgstr "core.ignoreCase"
@@ -2676,7 +2676,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:372
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.precomposeUnicode"
msgstr "core.precomposeUnicode"
@@ -2693,7 +2693,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:381
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.protectHFS"
msgstr "core.protectHFS"
@@ -2707,7 +2707,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:386
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.protectNTFS"
msgstr "core.protectNTFS"
@@ -2721,7 +2721,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:392
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.trustctime"
msgstr "core.trustctime"
@@ -2736,7 +2736,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:399
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.splitIndex"
msgstr "core.splitIndex"
@@ -2749,7 +2749,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:403
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.untrackedCache"
msgstr "core.untrackedCache"
@@ -2766,7 +2766,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:412
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.checkStat"
msgstr "core.checkStat"
@@ -2781,7 +2781,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:418
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.quotePath"
msgstr "core.quotePath"
@@ -2803,7 +2803,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:433
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.eol"
msgstr "core.eol"
@@ -2819,7 +2819,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:441
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.safecrlf"
msgstr "core.safecrlf"
@@ -2884,7 +2884,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:486
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.autocrlf"
msgstr "core.autocrlf"
@@ -2900,7 +2900,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:494
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.symlinks"
msgstr "core.symlinks"
@@ -2923,7 +2923,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:505
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.gitProxy"
msgstr "core.gitProxy"
@@ -2956,7 +2956,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:523
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.sshCommand"
msgstr "core.sshCommand"
@@ -2971,7 +2971,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:530
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.ignoreStat"
msgstr "core.ignoreStat"
@@ -3005,7 +3005,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:545
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.preferSymlinkRefs"
msgstr "core.preferSymlinkRefs"
@@ -3019,7 +3019,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:551
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.bare"
msgstr "core.bare"
@@ -3049,7 +3049,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:563
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.worktree"
msgstr "core.worktree"
@@ -3082,7 +3082,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:587
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.logAllRefUpdates"
msgstr "core.logAllRefUpdates"
@@ -3115,7 +3115,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:606
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.repositoryFormatVersion"
msgstr "core.repositoryFormatVersion"
@@ -3127,7 +3127,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:610
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.sharedRepository"
msgstr "core.sharedRepository"
@@ -3150,7 +3150,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:625
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.warnAmbiguousRefs"
msgstr "core.warnAmbiguousRefs"
@@ -3163,7 +3163,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:629
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.compression"
msgstr "core.compression"
@@ -3178,7 +3178,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:636
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.looseCompression"
msgstr "core.looseCompression"
@@ -3193,7 +3193,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:643
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.packedGitWindowSize"
msgstr "core.packedGitWindowSize"
@@ -3223,7 +3223,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:659
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.packedGitLimit"
msgstr "core.packedGitLimit"
@@ -3246,7 +3246,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:671
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.deltaBaseCacheLimit"
msgstr "core.deltaBaseCacheLimit"
@@ -3269,7 +3269,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:684
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.bigFileThreshold"
msgstr "core.bigFileThreshold"
@@ -3292,7 +3292,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:697
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.excludesFile"
msgstr "core.excludesFile"
@@ -3308,7 +3308,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:705
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.askPass"
msgstr "core.askPass"
@@ -3326,7 +3326,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:714
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.attributesFile"
msgstr "core.attributesFile"
@@ -3342,7 +3342,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:722
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.hooksPath"
msgstr "core.hooksPath"
@@ -3374,7 +3374,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:739
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.editor"
msgstr "core.editor"
@@ -3388,7 +3388,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:745
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.commentChar"
msgstr "core.commentChar"
@@ -3409,7 +3409,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:754
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.packedRefsTimeout"
msgstr "core.packedRefsTimeout"
@@ -3438,7 +3438,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:766
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.pager"
msgstr "core.pager"
@@ -3478,7 +3478,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:791
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.whitespace"
msgstr "core.whitespace"
@@ -3552,7 +3552,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:820
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.fsyncObjectFiles"
msgstr "core.fsyncObjectFiles"
@@ -3572,7 +3572,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:828
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.preloadIndex"
msgstr "core.preloadIndex"
@@ -3592,7 +3592,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:837
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.createObject"
msgstr "core.createObject"
@@ -3614,7 +3614,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:846 en/git-notes.txt:313
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.notesRef"
msgstr "core.notesRef"
@@ -3635,7 +3635,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:855
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.sparseCheckout"
msgstr "core.sparseCheckout"
@@ -3648,7 +3648,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:859
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "core.abbrev"
msgstr "core.abbrev"
@@ -3745,7 +3745,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:908 en/git-apply.txt:246
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "apply.ignoreWhitespace"
msgstr "apply.ignoreWhitespace"
@@ -3760,7 +3760,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:916 en/git-apply.txt:250
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "apply.whitespace"
msgstr "apply.whitespace"
@@ -3773,7 +3773,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:920
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "branch.autoSetupMerge"
msgstr "branch.autoSetupMerge"
@@ -3792,7 +3792,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:932
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "branch.autoSetupRebase"
msgstr "branch.autoSetupRebase"
@@ -3978,7 +3978,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1027
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "color.branch"
msgstr "color.branch"
@@ -4008,7 +4008,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1041
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "color.diff"
msgstr "color.diff"
@@ -4063,7 +4063,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1068
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "color.grep"
msgstr "color.grep"
@@ -4091,7 +4091,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1079
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`context`"
msgstr "`context`"
@@ -4102,7 +4102,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1081
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`filename`"
msgstr "`filename`"
@@ -4113,7 +4113,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1083
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`function`"
msgstr "`function`"
@@ -4124,7 +4124,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1085
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`linenumber`"
msgstr "`linenumber`"
@@ -4135,7 +4135,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1087
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`match`"
msgstr "`match`"
@@ -4146,7 +4146,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1089
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`matchContext`"
msgstr "`matchContext`"
@@ -4157,7 +4157,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1091
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`matchSelected`"
msgstr "`matchSelected`"
@@ -4168,7 +4168,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1093
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`selected`"
msgstr "`selected`"
@@ -4179,7 +4179,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1095
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`separator`"
msgstr "`separator`"
@@ -4192,7 +4192,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1100
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "color.interactive"
msgstr "color.interactive"
@@ -4222,7 +4222,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1114
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "color.pager"
msgstr "color.pager"
@@ -4235,7 +4235,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1118
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "color.showBranch"
msgstr "color.showBranch"
@@ -4251,7 +4251,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1125
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "color.status"
msgstr "color.status"
@@ -4284,7 +4284,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1143
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "color.ui"
msgstr "color.ui"
@@ -4304,7 +4304,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1155
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "column.ui"
msgstr "column.ui"
@@ -4324,7 +4324,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1164
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`always`"
msgstr "`always`"
@@ -4335,7 +4335,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1166
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`never`"
msgstr "`never`"
@@ -4346,7 +4346,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1168
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`auto`"
msgstr "`auto`"
@@ -4364,7 +4364,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1177
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`column`"
msgstr "`column`"
@@ -4375,7 +4375,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1179
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`row`"
msgstr "`row`"
@@ -4386,7 +4386,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1181
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`plain`"
msgstr "`plain`"
@@ -4404,7 +4404,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1189
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`dense`"
msgstr "`dense`"
@@ -4415,7 +4415,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1191
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`nodense`"
msgstr "`nodense`"
@@ -4426,7 +4426,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1195
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "column.branch"
msgstr "column.branch"
@@ -4439,7 +4439,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1199
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "column.clean"
msgstr "column.clean"
@@ -4452,7 +4452,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1203
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "column.status"
msgstr "column.status"
@@ -4465,7 +4465,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1207
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "column.tag"
msgstr "column.tag"
@@ -4478,7 +4478,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1211
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "commit.cleanup"
msgstr "commit.cleanup"
@@ -4495,7 +4495,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1220
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "commit.gpgSign"
msgstr "commit.gpgSign"
@@ -4510,7 +4510,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1228
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "commit.status"
msgstr "commit.status"
@@ -4524,7 +4524,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1233
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "commit.template"
msgstr "commit.template"
@@ -4537,7 +4537,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1237
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "commit.verbose"
msgstr "commit.verbose"
@@ -4550,7 +4550,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1241
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "credential.helper"
msgstr "credential.helper"
@@ -4565,7 +4565,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1248
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "credential.useHttpPath"
msgstr "credential.useHttpPath"
@@ -4579,7 +4579,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1253
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "credential.username"
msgstr "credential.username"
@@ -4648,7 +4648,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1282 en/git-difftool.txt:126
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "difftool.prompt"
msgstr "difftool.prompt"
@@ -4659,7 +4659,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1285 en/git-fast-import.txt:139
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "fastimport.unpackLimit"
msgstr "fastimport.unpackLimit"
@@ -4676,7 +4676,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1294
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "fetch.recurseSubmodules"
msgstr "fetch.recurseSubmodules"
@@ -4693,7 +4693,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1303
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "fetch.fsckObjects"
msgstr "fetch.fsckObjects"
@@ -4708,7 +4708,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1310
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "fetch.unpackLimit"
msgstr "fetch.unpackLimit"
@@ -4726,7 +4726,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1321
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "fetch.prune"
msgstr "fetch.prune"
@@ -4739,7 +4739,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1325
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "fetch.output"
msgstr "fetch.output"
@@ -4753,7 +4753,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1330
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "format.attach"
msgstr "format.attach"
@@ -4768,7 +4768,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1337
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "format.from"
msgstr "format.from"
@@ -4787,7 +4787,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1347
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "format.numbered"
msgstr "format.numbered"
@@ -4803,7 +4803,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1354
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "format.headers"
msgstr "format.headers"
@@ -4816,13 +4816,13 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1358
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "format.to"
msgstr "format.to"
#. type: Labeled list
#: en/config.txt:1359
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "format.cc"
msgstr "format.cc"
@@ -4835,7 +4835,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1364
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "format.subjectPrefix"
msgstr "format.subjectPrefix"
@@ -4848,7 +4848,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1368
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "format.signature"
msgstr "format.signature"
@@ -4862,7 +4862,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1374
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "format.signatureFile"
msgstr "format.signatureFile"
@@ -4875,7 +4875,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1378
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "format.suffix"
msgstr "format.suffix"
@@ -4889,7 +4889,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1383 en/git-log.txt:175
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "format.pretty"
msgstr "format.pretty"
@@ -4902,7 +4902,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1388
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "format.thread"
msgstr "format.thread"
@@ -4919,7 +4919,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1398
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "format.signOff"
msgstr "format.signOff"
@@ -4935,7 +4935,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1405
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "format.coverLetter"
msgstr "format.coverLetter"
@@ -4949,7 +4949,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1410
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "format.outputDirectory"
msgstr "format.outputDirectory"
@@ -4962,7 +4962,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1414
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "format.useAutoBase"
msgstr "format.useAutoBase"
@@ -5393,25 +5393,25 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1602
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "gitweb.category"
msgstr "gitweb.category"
#. type: Labeled list
#: en/config.txt:1603
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "gitweb.description"
msgstr "gitweb.description"
#. type: Labeled list
#: en/config.txt:1604
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "gitweb.owner"
msgstr "gitweb.owner"
#. type: Labeled list
#: en/config.txt:1605
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "gitweb.url"
msgstr "gitweb.url"
@@ -5422,55 +5422,55 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1608
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "gitweb.avatar"
msgstr "gitweb.avatar"
#. type: Labeled list
#: en/config.txt:1609
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "gitweb.blame"
msgstr "gitweb.blame"
#. type: Labeled list
#: en/config.txt:1610
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "gitweb.grep"
msgstr "gitweb.grep"
#. type: Labeled list
#: en/config.txt:1611
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "gitweb.highlight"
msgstr "gitweb.highlight"
#. type: Labeled list
#: en/config.txt:1612
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "gitweb.patches"
msgstr "gitweb.patches"
#. type: Labeled list
#: en/config.txt:1613
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "gitweb.pickaxe"
msgstr "gitweb.pickaxe"
#. type: Labeled list
#: en/config.txt:1614
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "gitweb.remote_heads"
msgstr "gitweb.remote_heads"
#. type: Labeled list
#: en/config.txt:1615
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "gitweb.showSizes"
msgstr "gitweb.showSizes"
#. type: Labeled list
#: en/config.txt:1616
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "gitweb.snapshot"
msgstr "gitweb.snapshot"
@@ -5566,7 +5566,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1652
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "gui.commitMsgWidth"
msgstr "gui.commitMsgWidth"
@@ -5579,7 +5579,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1656
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "gui.diffContext"
msgstr "gui.diffContext"
@@ -5592,7 +5592,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1660
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "gui.displayUntracked"
msgstr "gui.displayUntracked"
@@ -5605,7 +5605,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1664
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "gui.encoding"
msgstr "gui.encoding"
@@ -5620,7 +5620,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1672
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "gui.matchTrackingBranch"
msgstr "gui.matchTrackingBranch"
@@ -5633,7 +5633,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1677
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "gui.newBranchTemplate"
msgstr "gui.newBranchTemplate"
@@ -5646,7 +5646,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1681
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "gui.pruneDuringFetch"
msgstr "gui.pruneDuringFetch"
@@ -5659,7 +5659,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1685
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "gui.trustmtime"
msgstr "gui.trustmtime"
@@ -5672,7 +5672,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1689
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "gui.spellingDictionary"
msgstr "gui.spellingDictionary"
@@ -5685,7 +5685,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1694
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "gui.fastCopyBlame"
msgstr "gui.fastCopyBlame"
@@ -5699,7 +5699,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1699
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "gui.copyBlameThreshold"
msgstr "gui.copyBlameThreshold"
@@ -5713,7 +5713,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1704
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "gui.blamehistoryctx"
msgstr "gui.blamehistoryctx"
@@ -5866,7 +5866,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1761
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "help.browser"
msgstr "help.browser"
@@ -5879,7 +5879,7 @@ msgstr ""
#. type: Title ~
#: en/config.txt:1765 en/git-help.txt:81
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "help.format"
msgstr "help.format"
@@ -5893,7 +5893,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1770
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "help.autoCorrect"
msgstr "help.autoCorrect"
@@ -5910,7 +5910,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:1779
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "help.htmlPath"
msgstr "help.htmlPath"
@@ -6497,7 +6497,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2046
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "i18n.commitEncoding"
msgstr "i18n.commitEncoding"
@@ -6513,7 +6513,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2053 en/git-log.txt:179
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "i18n.logOutputEncoding"
msgstr "i18n.logOutputEncoding"
@@ -6565,7 +6565,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2069
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "instaweb.browser"
msgstr "instaweb.browser"
@@ -6578,7 +6578,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2073
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "instaweb.httpd"
msgstr "instaweb.httpd"
@@ -6591,7 +6591,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2077
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "instaweb.local"
msgstr "instaweb.local"
@@ -6604,7 +6604,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2081
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "instaweb.modulePath"
msgstr "instaweb.modulePath"
@@ -6617,7 +6617,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2086
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "instaweb.port"
msgstr "instaweb.port"
@@ -6629,7 +6629,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2090
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "interactive.singleKey"
msgstr "interactive.singleKey"
@@ -6646,7 +6646,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2099
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "interactive.diffFilter"
msgstr "interactive.diffFilter"
@@ -6662,7 +6662,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2107
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "log.abbrevCommit"
msgstr "log.abbrevCommit"
@@ -6676,7 +6676,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2112 en/git-log.txt:184
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "log.date"
msgstr "log.date"
@@ -6690,7 +6690,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2117
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "log.decorate"
msgstr "log.decorate"
@@ -6708,7 +6708,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2127 en/git-log.txt:189
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "log.follow"
msgstr "log.follow"
@@ -6723,7 +6723,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2133
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "log.graphColors"
msgstr "log.graphColors"
@@ -6736,7 +6736,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2137 en/git-log.txt:195
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "log.showRoot"
msgstr "log.showRoot"
@@ -6751,7 +6751,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2143
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "log.mailmap"
msgstr "log.mailmap"
@@ -6764,7 +6764,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2147
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "mailinfo.scissors"
msgstr "mailinfo.scissors"
@@ -6892,7 +6892,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2208
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "mergetool.meld.hasOutput"
msgstr "mergetool.meld.hasOutput"
@@ -6909,7 +6909,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2217
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "mergetool.keepBackup"
msgstr "mergetool.keepBackup"
@@ -6924,7 +6924,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2223
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "mergetool.keepTemporaries"
msgstr "mergetool.keepTemporaries"
@@ -6939,7 +6939,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2230
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "mergetool.writeToTemp"
msgstr "mergetool.writeToTemp"
@@ -6953,7 +6953,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2236
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "mergetool.prompt"
msgstr "mergetool.prompt"
@@ -7477,7 +7477,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2501
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "push.default"
msgstr "push.default"
@@ -7572,7 +7572,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2558
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "push.followTags"
msgstr "push.followTags"
@@ -7585,7 +7585,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2563
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "push.gpgSign"
msgstr "push.gpgSign"
@@ -7602,7 +7602,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2572
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "push.recurseSubmodules"
msgstr "push.recurseSubmodules"
@@ -7695,7 +7695,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2617
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "receive.advertiseAtomic"
msgstr "receive.advertiseAtomic"
@@ -7709,7 +7709,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2622
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "receive.advertisePushOptions"
msgstr "receive.advertisePushOptions"
@@ -7723,7 +7723,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2627
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "receive.autogc"
msgstr "receive.autogc"
@@ -7737,7 +7737,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2632
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "receive.certNonceSeed"
msgstr "receive.certNonceSeed"
@@ -7751,7 +7751,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2638
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "receive.certNonceSlop"
msgstr "receive.certNonceSlop"
@@ -7771,7 +7771,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2651
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "receive.fsckObjects"
msgstr "receive.fsckObjects"
@@ -7813,13 +7813,13 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2672
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "receive.fsck.skipList"
msgstr "receive.fsck.skipList"
#. type: Labeled list
#: en/config.txt:2680
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "receive.keepAlive"
msgstr "receive.keepAlive"
@@ -7836,7 +7836,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2689
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "receive.unpackLimit"
msgstr "receive.unpackLimit"
@@ -7854,7 +7854,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2699
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "receive.maxInputSize"
msgstr "receive.maxInputSize"
@@ -7868,7 +7868,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2705
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "receive.denyDeletes"
msgstr "receive.denyDeletes"
@@ -7881,7 +7881,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2709
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "receive.denyDeleteCurrent"
msgstr "receive.denyDeleteCurrent"
@@ -7894,7 +7894,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2713
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "receive.denyCurrentBranch"
msgstr "receive.denyCurrentBranch"
@@ -7930,7 +7930,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2733
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "receive.denyNonFastForwards"
msgstr "receive.denyNonFastForwards"
@@ -7945,7 +7945,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2739
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "receive.hideRefs"
msgstr "receive.hideRefs"
@@ -7959,7 +7959,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2745
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "receive.updateServerInfo"
msgstr "receive.updateServerInfo"
@@ -7972,7 +7972,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2749
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "receive.shallowUpdate"
msgstr "receive.shallowUpdate"
@@ -7985,7 +7985,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2753
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "remote.pushDefault"
msgstr "remote.pushDefault"
@@ -8192,7 +8192,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2827
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "repack.useDeltaBaseOffset"
msgstr "repack.useDeltaBaseOffset"
@@ -8208,7 +8208,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2835
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "repack.packKeptObjects"
msgstr "repack.packKeptObjects"
@@ -8223,7 +8223,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2842
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "repack.writeBitmaps"
msgstr "repack.writeBitmaps"
@@ -8269,7 +8269,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2864
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.identity"
msgstr "sendemail.identity"
@@ -8284,7 +8284,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2870
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.smtpEncryption"
msgstr "sendemail.smtpEncryption"
@@ -8308,7 +8308,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2877
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.smtpsslcertpath"
msgstr "sendemail.smtpsslcertpath"
@@ -8335,151 +8335,151 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2887 en/git-send-email.txt:404
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.aliasesFile"
msgstr "sendemail.aliasesFile"
#. type: Labeled list
#: en/config.txt:2888 en/git-send-email.txt:408
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.aliasFileType"
msgstr "sendemail.aliasFileType"
#. type: Labeled list
#: en/config.txt:2889
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.annotate"
msgstr "sendemail.annotate"
#. type: Labeled list
#: en/config.txt:2890
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.bcc"
msgstr "sendemail.bcc"
#. type: Labeled list
#: en/config.txt:2891
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.cc"
msgstr "sendemail.cc"
#. type: Labeled list
#: en/config.txt:2892
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.ccCmd"
msgstr "sendemail.ccCmd"
#. type: Labeled list
#: en/config.txt:2893
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.chainReplyTo"
msgstr "sendemail.chainReplyTo"
#. type: Labeled list
#: en/config.txt:2894 en/git-send-email.txt:435
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.confirm"
msgstr "sendemail.confirm"
#. type: Labeled list
#: en/config.txt:2895
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.envelopeSender"
msgstr "sendemail.envelopeSender"
#. type: Labeled list
#: en/config.txt:2896
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.from"
msgstr "sendemail.from"
#. type: Labeled list
#: en/config.txt:2897 en/git-send-email.txt:429
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.multiEdit"
msgstr "sendemail.multiEdit"
#. type: Labeled list
#: en/config.txt:2898
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.signedoffbycc"
msgstr "sendemail.signedoffbycc"
#. type: Labeled list
#: en/config.txt:2899
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.smtpPass"
msgstr "sendemail.smtpPass"
#. type: Labeled list
#: en/config.txt:2900
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.suppresscc"
msgstr "sendemail.suppresscc"
#. type: Labeled list
#: en/config.txt:2901
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.suppressFrom"
msgstr "sendemail.suppressFrom"
#. type: Labeled list
#: en/config.txt:2902
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.to"
msgstr "sendemail.to"
#. type: Labeled list
#: en/config.txt:2903
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.smtpDomain"
msgstr "sendemail.smtpDomain"
#. type: Labeled list
#: en/config.txt:2904
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.smtpServer"
msgstr "sendemail.smtpServer"
#. type: Labeled list
#: en/config.txt:2905
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.smtpServerPort"
msgstr "sendemail.smtpServerPort"
#. type: Labeled list
#: en/config.txt:2906
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.smtpServerOption"
msgstr "sendemail.smtpServerOption"
#. type: Labeled list
#: en/config.txt:2907
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.smtpUser"
msgstr "sendemail.smtpUser"
#. type: Labeled list
#: en/config.txt:2908
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.thread"
msgstr "sendemail.thread"
#. type: Labeled list
#: en/config.txt:2909
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.transferEncoding"
msgstr "sendemail.transferEncoding"
#. type: Labeled list
#: en/config.txt:2910
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.validate"
msgstr "sendemail.validate"
#. type: Labeled list
#: en/config.txt:2911
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "sendemail.xmailer"
msgstr "sendemail.xmailer"
@@ -8501,7 +8501,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2917
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "showbranch.default"
msgstr "showbranch.default"
@@ -8514,7 +8514,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2921
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "splitIndex.maxPercentChange"
msgstr "splitIndex.maxPercentChange"
@@ -8533,7 +8533,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2934
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "splitIndex.sharedIndexExpire"
msgstr "splitIndex.sharedIndexExpire"
@@ -8552,7 +8552,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2946
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "status.relativePaths"
msgstr "status.relativePaths"
@@ -8566,7 +8566,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2952
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "status.short"
msgstr "status.short"
@@ -8579,7 +8579,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2956
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "status.branch"
msgstr "status.branch"
@@ -8592,7 +8592,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2960
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "status.displayCommentPrefix"
msgstr "status.displayCommentPrefix"
@@ -8607,7 +8607,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2967
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "status.showUntrackedFiles"
msgstr "status.showUntrackedFiles"
@@ -8647,7 +8647,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:2986
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "status.submoduleSummary"
msgstr "status.submoduleSummary"
@@ -8669,7 +8669,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:3002
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "stash.showPatch"
msgstr "stash.showPatch"
@@ -8683,7 +8683,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:3007
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "stash.showStat"
msgstr "stash.showStat"
@@ -8781,7 +8781,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:3055
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "submodule.fetchJobs"
msgstr "submodule.fetchJobs"
@@ -8796,7 +8796,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:3061
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "submodule.alternateLocation"
msgstr "submodule.alternateLocation"
@@ -8812,7 +8812,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:3068
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "submodule.alternateErrorStrategy"
msgstr "submodule.alternateErrorStrategy"
@@ -8869,7 +8869,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:3090
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "transfer.fsckObjects"
msgstr "transfer.fsckObjects"
@@ -8882,7 +8882,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:3095
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "transfer.hideRefs"
msgstr "transfer.hideRefs"
@@ -8930,7 +8930,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:3123
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "transfer.unpackLimit"
msgstr "transfer.unpackLimit"
@@ -9104,7 +9104,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:3214
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "user.email"
msgstr "user.email"
@@ -9118,7 +9118,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:3219
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "user.name"
msgstr "user.name"
@@ -9132,7 +9132,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:3224
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "user.useConfigOnly"
msgstr "user.useConfigOnly"
@@ -9150,7 +9150,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:3234
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "user.signingKey"
msgstr "user.signingKey"
@@ -9307,7 +9307,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:1
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "diff.autoRefreshIndex"
msgstr "diff.autoRefreshIndex"
@@ -9324,7 +9324,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:11
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "diff.dirstat"
msgstr "diff.dirstat"
@@ -9341,7 +9341,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:20 en/diff-options.txt:137
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`changes`"
msgstr "`changes`"
@@ -9357,7 +9357,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:26 en/diff-options.txt:143
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`lines`"
msgstr "`lines`"
@@ -9375,7 +9375,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:34 en/diff-options.txt:151
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`files`"
msgstr "`files`"
@@ -9390,7 +9390,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:39 en/diff-options.txt:156
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`cumulative`"
msgstr "`cumulative`"
@@ -9427,7 +9427,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:55
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "diff.statGraphWidth"
msgstr "diff.statGraphWidth"
@@ -9440,7 +9440,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:59
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "diff.context"
msgstr "diff.context"
@@ -9453,7 +9453,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:63
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "diff.interHunkContext"
msgstr "diff.interHunkContext"
@@ -9467,7 +9467,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:69
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "diff.external"
msgstr "diff.external"
@@ -9484,7 +9484,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:78
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "diff.ignoreSubmodules"
msgstr "diff.ignoreSubmodules"
@@ -9502,7 +9502,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:88
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "diff.mnemonicPrefix"
msgstr "diff.mnemonicPrefix"
@@ -9572,7 +9572,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:104
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "diff.noprefix"
msgstr "diff.noprefix"
@@ -9583,7 +9583,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:107
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "diff.orderFile"
msgstr "diff.orderFile"
@@ -9597,7 +9597,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:113
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "diff.renameLimit"
msgstr "diff.renameLimit"
@@ -9610,7 +9610,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:117
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "diff.renames"
msgstr "diff.renames"
@@ -9627,7 +9627,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:126
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "diff.suppressBlankEmpty"
msgstr "diff.suppressBlankEmpty"
@@ -9640,7 +9640,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:130
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "diff.submodule"
msgstr "diff.submodule"
@@ -9656,7 +9656,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:138
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "diff.wordRegex"
msgstr "diff.wordRegex"
@@ -9750,7 +9750,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:172 en/git-difftool.txt:111
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "diff.tool"
msgstr "diff.tool"
@@ -9765,7 +9765,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:181
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "diff.indentHeuristic"
msgstr "diff.indentHeuristic"
@@ -9778,7 +9778,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:185
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "diff.algorithm"
msgstr "diff.algorithm"
@@ -9800,7 +9800,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:191 en/diff-options.txt:84
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`minimal`"
msgstr "`minimal`"
@@ -9811,7 +9811,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:194 en/diff-options.txt:87
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`patience`"
msgstr "`patience`"
@@ -9822,7 +9822,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:196 en/diff-options.txt:89
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`histogram`"
msgstr "`histogram`"
@@ -9835,7 +9835,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-config.txt:202
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "diff.wsErrorHighlight"
msgstr "diff.wsErrorHighlight"
@@ -10596,7 +10596,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:17 en/git-rebase.txt:319 en/merge-options.txt:57
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-stat"
msgstr "--no-stat"
@@ -10610,14 +10610,14 @@ msgstr ""
#: en/git-am.txt:77 en/git-checkout-index.txt:25 en/git-cvsexportcommit.txt:64
#: en/git-cvsimport.txt:98 en/git-ls-files.txt:69 en/git-mailinfo.txt:52
#: en/git-push.txt:245 en/git-read-tree.txt:44
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "-u"
msgstr "-u"
#. type: Labeled list
#: en/diff-options.txt:24 en/git-add.txt:86 en/git-checkout.txt:243
#: en/git-commit.txt:67
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--patch"
msgstr "--patch"
@@ -10639,13 +10639,13 @@ msgstr ""
#: en/git-ls-files.txt:58 en/git-revert.txt:89 en/git-shortlog.txt:34
#: en/git-show-ref.txt:53 en/git-status.txt:27 en/git-stripspace.txt:38
#: en/git-svn.txt:46 en/git-tag.txt:63 en/git-verify-pack.txt:31
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "-s"
msgstr "-s"
#. type: Labeled list
#: en/diff-options.txt:31
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-patch"
msgstr "--no-patch"
@@ -10682,7 +10682,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:45 en/git-replace.txt:77 en/git-verify-commit.txt:19
#: en/git-verify-tag.txt:19
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--raw"
msgstr "--raw"
@@ -10705,7 +10705,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:62
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--patch-with-raw"
msgstr "--patch-with-raw"
@@ -10716,13 +10716,13 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:68
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--minimal"
msgstr "--minimal"
#. type: Labeled list
#: en/diff-options.txt:72
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--patience"
msgstr "--patience"
@@ -10733,7 +10733,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:75
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--histogram"
msgstr "--histogram"
@@ -10791,7 +10791,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:116 en/git-apply.txt:45
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--numstat"
msgstr "--numstat"
@@ -10805,7 +10805,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:123
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--shortstat"
msgstr "--shortstat"
@@ -10844,7 +10844,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:172 en/git-apply.txt:52 en/git-shortlog.txt:35
#: en/merge-options.txt:98
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--summary"
msgstr "--summary"
@@ -10857,7 +10857,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:177
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--patch-with-stat"
msgstr "--patch-with-stat"
@@ -10872,7 +10872,7 @@ msgstr ""
#: en/git-commit.txt:118 en/git-config.txt:183 en/git-grep.txt:196
#: en/git-ls-files.txt:79 en/git-ls-tree.txt:55 en/git-mktree.txt:23
#: en/git-status.txt:100 en/git-update-index.txt:160
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "-z"
msgstr "-z"
@@ -10908,7 +10908,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:199 en/git-config.txt:192 en/git-grep.txt:178
#: en/git-ls-tree.txt:59 en/git-name-rev.txt:51
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--name-only"
msgstr "--name-only"
@@ -10919,7 +10919,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:202 en/git-ls-tree.txt:60
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--name-status"
msgstr "--name-status"
@@ -10975,7 +10975,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:227 en/git-branch.txt:119 en/git-grep.txt:210
#: en/git-show-branch.txt:124
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-color"
msgstr "--no-color"
@@ -11118,7 +11118,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:287
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-renames"
msgstr "--no-renames"
@@ -11131,7 +11131,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:292 en/git-apply.txt:58
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--check"
msgstr "--check"
@@ -11167,7 +11167,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:315
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--full-index"
msgstr "--full-index"
@@ -11181,7 +11181,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:320 en/git-apply.txt:150
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--binary"
msgstr "--binary"
@@ -11316,7 +11316,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:380 en/git-svn.txt:595
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--find-copies-harder"
msgstr "--find-copies-harder"
@@ -11338,7 +11338,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:390
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--irreversible-delete"
msgstr "--irreversible-delete"
@@ -11469,7 +11469,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:457
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--pickaxe-all"
msgstr "--pickaxe-all"
@@ -11482,7 +11482,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:462
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--pickaxe-regex"
msgstr "--pickaxe-regex"
@@ -11590,13 +11590,13 @@ msgstr ""
#: en/git-help.txt:41 en/git-http-fetch.txt:31 en/git-merge-base.txt:71
#: en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47
#: en/git-tag.txt:59
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "-a"
msgstr "-a"
#. type: Labeled list
#: en/diff-options.txt:519 en/git-grep.txt:106
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--text"
msgstr "--text"
@@ -11607,7 +11607,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:522
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--ignore-space-at-eol"
msgstr "--ignore-space-at-eol"
@@ -11618,7 +11618,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:526 en/git-am.txt:102 en/git-apply.txt:172
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--ignore-space-change"
msgstr "--ignore-space-change"
@@ -11633,13 +11633,13 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:531 en/git-blame.txt:83 en/git-cvsexportcommit.txt:71
#: en/git-grep.txt:131 en/git-hash-object.txt:31 en/git-help.txt:66
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "-w"
msgstr "-w"
#. type: Labeled list
#: en/diff-options.txt:532
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--ignore-all-space"
msgstr "--ignore-all-space"
@@ -11652,7 +11652,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:537
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--ignore-blank-lines"
msgstr "--ignore-blank-lines"
@@ -11683,7 +11683,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:547 en/git-grep.txt:247
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--function-context"
msgstr "--function-context"
@@ -11694,7 +11694,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:552 en/git-ls-remote.txt:46
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--exit-code"
msgstr "--exit-code"
@@ -11718,7 +11718,7 @@ msgstr ""
#: en/git-show-ref.txt:71 en/git-submodule.txt:272 en/git-svn.txt:633
#: en/git-symbolic-ref.txt:40 en/merge-options.txt:105
#: en/rev-list-options.txt:201
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--quiet"
msgstr "--quiet"
@@ -11729,7 +11729,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:562
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--ext-diff"
msgstr "--ext-diff"
@@ -11743,7 +11743,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:567
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-ext-diff"
msgstr "--no-ext-diff"
@@ -11754,13 +11754,13 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:570 en/git-cat-file.txt:59 en/git-grep.txt:109
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--textconv"
msgstr "--textconv"
#. type: Labeled list
#: en/diff-options.txt:571 en/git-grep.txt:112
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-textconv"
msgstr "--no-textconv"
@@ -11822,7 +11822,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:600
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-prefix"
msgstr "--no-prefix"
@@ -11844,7 +11844,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:606
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--ita-invisible-in-index"
msgstr "--ita-invisible-in-index"
@@ -11874,7 +11874,7 @@ msgstr ""
#: en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37
#: en/git-show-branch.txt:48 en/git-submodule.txt:275
#: en/rev-list-options.txt:135
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--all"
msgstr "--all"
@@ -11885,7 +11885,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:5
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--append"
msgstr "--append"
@@ -11956,7 +11956,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:31
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--unshallow"
msgstr "--unshallow"
@@ -11976,7 +11976,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:39
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--update-shallow"
msgstr "--update-shallow"
@@ -11996,7 +11996,7 @@ msgstr ""
#: en/git-read-tree.txt:58 en/git-reflog.txt:115 en/git-rm.txt:44
#: en/git-send-email.txt:362 en/git-send-pack.txt:51 en/git-svn.txt:649
#: en/git-worktree.txt:111
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--dry-run"
msgstr "--dry-run"
@@ -12013,7 +12013,7 @@ msgstr ""
#: en/git-push.txt:221 en/git-rebase.txt:335 en/git-repack.txt:65
#: en/git-replace.txt:59 en/git-rm.txt:39 en/git-submodule.txt:287
#: en/git-tag.txt:71 en/git-update-server-info.txt:26 en/git-worktree.txt:85
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "-f"
msgstr "-f"
@@ -12025,7 +12025,7 @@ msgstr "-f"
#: en/git-push.txt:222 en/git-replace.txt:60 en/git-rm.txt:40
#: en/git-send-email.txt:387 en/git-send-pack.txt:54 en/git-submodule.txt:288
#: en/git-tag.txt:72 en/git-update-server-info.txt:27 en/git-worktree.txt:86
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--force"
msgstr "--force"
@@ -12042,14 +12042,14 @@ msgstr ""
#: en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53
#: en/git-format-patch.txt:108 en/git-ls-files.txt:73 en/git-mailinfo.txt:27
#: en/git-mv.txt:34 en/git-repack.txt:139
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "-k"
msgstr "-k"
#. type: Labeled list
#: en/fetch-options.txt:59 en/git-am.txt:41 en/git-fetch-pack.txt:54
#: en/git-index-pack.txt:54 en/git-reset.txt:82
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--keep"
msgstr "--keep"
@@ -12060,7 +12060,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:63
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--multiple"
msgstr "--multiple"
@@ -12073,7 +12073,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:68 en/git-push.txt:98
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--prune"
msgstr "--prune"
@@ -12100,13 +12100,13 @@ msgstr ""
#: en/git-shortlog.txt:29 en/git-submodule.txt:310 en/git-svn.txt:648
#: en/git-unpack-objects.txt:30 en/git-worktree.txt:110
#: en/merge-options.txt:56
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "-n"
msgstr "-n"
#. type: Labeled list
#: en/fetch-options.txt:82
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-tags"
msgstr "--no-tags"
@@ -12139,7 +12139,7 @@ msgstr ""
#: en/fetch-options.txt:99 en/git-describe.txt:42 en/git-fsck.txt:41
#: en/git-ls-remote.txt:27 en/git-name-rev.txt:24 en/git-push.txt:130
#: en/git-show-ref.txt:40
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--tags"
msgstr "--tags"
@@ -12174,7 +12174,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:118
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "-j"
msgstr "-j"
@@ -12194,7 +12194,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:125 en/git-push.txt:274
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-recurse-submodules"
msgstr "--no-recurse-submodules"
@@ -12237,7 +12237,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:144
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--update-head-ok"
msgstr "--update-head-ok"
@@ -12277,7 +12277,7 @@ msgstr ""
#: en/git-show-ref.txt:70 en/git-submodule.txt:271 en/git-svn.txt:632
#: en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34
#: en/git-update-index.txt:56 en/merge-options.txt:104
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "-q"
msgstr "-q"
@@ -12302,7 +12302,7 @@ msgstr ""
#: en/git-svn.txt:350 en/git-tag.txt:79 en/git-verify-commit.txt:23
#: en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:120
#: en/merge-options.txt:108
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "-v"
msgstr "-v"
@@ -12318,7 +12318,7 @@ msgstr "-v"
#: en/git-svn.txt:351 en/git-update-index.txt:145 en/git-verify-commit.txt:24
#: en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:121
#: en/merge-options.txt:109
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--verbose"
msgstr "--verbose"
@@ -12331,7 +12331,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:170 en/git-clone.txt:128 en/git-pack-objects.txt:136
#: en/git-push.txt:268 en/merge-options.txt:112
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--progress"
msgstr "--progress"
@@ -12346,13 +12346,13 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:176 en/git-push.txt:295
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "-4"
msgstr "-4"
#. type: Labeled list
#: en/fetch-options.txt:177 en/git-push.txt:296
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--ipv4"
msgstr "--ipv4"
@@ -12363,13 +12363,13 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:180 en/git-push.txt:299
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "-6"
msgstr "-6"
#. type: Labeled list
#: en/fetch-options.txt:181 en/git-push.txt:300
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--ipv6"
msgstr "--ipv6"
@@ -12380,7 +12380,7 @@ msgstr ""
#. type: Labeled list
#: en/fmt-merge-msg-config.txt:1
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "merge.branchdesc"
msgstr "merge.branchdesc"
@@ -12393,7 +12393,7 @@ msgstr ""
#. type: Labeled list
#: en/fmt-merge-msg-config.txt:6
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "merge.log"
msgstr "merge.log"
@@ -12407,7 +12407,7 @@ msgstr ""
#. type: Title =
#: en/git-add.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-add(1)"
msgstr "git-add(1)"
@@ -12745,14 +12745,14 @@ msgstr ""
#: en/git-grep.txt:116 en/git-help.txt:51 en/git-ls-files.txt:51
#: en/git-read-tree.txt:48 en/git-rebase.txt:373 en/git-tag.txt:111
#: en/rev-list-options.txt:75
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "-i"
msgstr "-i"
#. type: Labeled list
#: en/git-add.txt:79 en/git-am.txt:123 en/git-clean.txt:43
#: en/git-rebase.txt:374 en/git-svn.txt:281
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--interactive"
msgstr "--interactive"
@@ -12785,7 +12785,7 @@ msgstr ""
#: en/git-cherry-pick.txt:55 en/git-commit.txt:212 en/git-config.txt:220
#: en/git-grep.txt:260 en/git-revert.txt:43 en/git-shortlog.txt:38
#: en/git-svn.txt:583 en/merge-options.txt:11
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "-e"
msgstr "-e"
@@ -12793,7 +12793,7 @@ msgstr "-e"
#: en/git-add.txt:97 en/git-cherry-pick.txt:56 en/git-commit.txt:213
#: en/git-config.txt:221 en/git-revert.txt:44 en/git-svn.txt:584
#: en/merge-options.txt:10
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--edit"
msgstr "--edit"
@@ -12817,7 +12817,7 @@ msgstr ""
#. type: Labeled list
#: en/git-add.txt:109
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--update"
msgstr "--update"
@@ -12845,7 +12845,7 @@ msgstr ""
#. type: Labeled list
#: en/git-add.txt:121
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-ignore-removal"
msgstr "--no-ignore-removal"
@@ -12867,13 +12867,13 @@ msgstr ""
#. type: Labeled list
#: en/git-add.txt:132
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-all"
msgstr "--no-all"
#. type: Labeled list
#: en/git-add.txt:133
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--ignore-removal"
msgstr "--ignore-removal"
@@ -12901,7 +12901,7 @@ msgstr ""
#. type: Labeled list
#: en/git-add.txt:144
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--intent-to-add"
msgstr "--intent-to-add"
@@ -12916,7 +12916,7 @@ msgstr ""
#. type: Labeled list
#: en/git-add.txt:151 en/git-update-index.txt:52
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--refresh"
msgstr "--refresh"
@@ -12929,7 +12929,7 @@ msgstr ""
#. type: Labeled list
#: en/git-add.txt:155
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--ignore-errors"
msgstr "--ignore-errors"
@@ -12945,7 +12945,7 @@ msgstr ""
#. type: Labeled list
#: en/git-add.txt:162 en/git-notes.txt:169 en/git-update-index.txt:70
#: en/rev-list-options.txt:182
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--ignore-missing"
msgstr "--ignore-missing"
@@ -13267,7 +13267,7 @@ msgstr ""
#. type: Labeled list
#: en/git-add.txt:328
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "diff"
msgstr "diff"
@@ -13580,7 +13580,7 @@ msgstr ""
#. type: Title =
#: en/git-am.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-am(1)"
msgstr "git-am(1)"
@@ -13627,7 +13627,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:35 en/git-cherry-pick.txt:101 en/git-commit.txt:160
#: en/git-format-patch.txt:114 en/git-revert.txt:90
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--signoff"
msgstr "--signoff"
@@ -13646,7 +13646,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:44
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--keep-non-patch"
msgstr "--keep-non-patch"
@@ -13657,7 +13657,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:47
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]keep-cr"
msgstr "--[no-]keep-cr"
@@ -13675,13 +13675,13 @@ msgstr ""
#: en/git-diff-files.txt:37 en/git-diff-tree.txt:91 en/git-grep.txt:201
#: en/git-http-fetch.txt:27 en/git-ls-files.txt:35 en/git-shortlog.txt:50
#: en/git-stripspace.txt:42 en/rev-list-options.txt:866
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "-c"
msgstr "-c"
#. type: Labeled list
#: en/git-am.txt:54 en/git-mailinfo.txt:74
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--scissors"
msgstr "--scissors"
@@ -13695,7 +13695,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:59 en/git-mailinfo.txt:90
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-scissors"
msgstr "--no-scissors"
@@ -13711,13 +13711,13 @@ msgstr ""
#: en/git-instaweb.txt:35 en/git-ls-files.txt:43 en/git-mailinfo.txt:69
#: en/git-read-tree.txt:34 en/git-rebase.txt:270 en/git-svn.txt:292
#: en/git-svn.txt:637 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:879
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "-m"
msgstr "-m"
#. type: Labeled list
#: en/git-am.txt:63 en/git-mailinfo.txt:70
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--message-id"
msgstr "--message-id"
@@ -13731,7 +13731,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:69
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-message-id"
msgstr "--no-message-id"
@@ -13749,7 +13749,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:78
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--utf8"
msgstr "--utf8"
@@ -13772,7 +13772,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:88
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-utf8"
msgstr "--no-utf8"
@@ -13783,19 +13783,19 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:92 en/git-apply.txt:77
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "-3"
msgstr "-3"
#. type: Labeled list
#: en/git-am.txt:93 en/git-apply.txt:78
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--3way"
msgstr "--3way"
#. type: Labeled list
#: en/git-am.txt:94
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-3way"
msgstr "--no-3way"
@@ -13811,7 +13811,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:103 en/git-apply.txt:173 en/git-rebase.txt:361
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--ignore-whitespace"
msgstr "--ignore-whitespace"
@@ -13853,7 +13853,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:110 en/git-apply.txt:100
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--reject"
msgstr "--reject"
@@ -13866,7 +13866,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:115
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--patch-format"
msgstr "--patch-format"
@@ -13886,7 +13886,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:126 en/git-rebase.txt:367
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--committer-date-is-author-date"
msgstr "--committer-date-is-author-date"
@@ -13901,7 +13901,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:133 en/git-rebase.txt:368
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--ignore-date"
msgstr "--ignore-date"
@@ -13916,7 +13916,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:140 en/git-rebase.txt:264
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--skip"
msgstr "--skip"
@@ -13955,7 +13955,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:150 en/git-merge.txt:105 en/git-rebase.txt:245
#: en/sequencer.txt:1
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--continue"
msgstr "--continue"
@@ -13964,13 +13964,13 @@ msgstr "--continue"
#: en/git-diff-tree.txt:39 en/git-ls-tree.txt:44 en/git-pull.txt:103
#: en/git-rm.txt:49 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38
#: en/rev-list-options.txt:887
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "-r"
msgstr "-r"
#. type: Labeled list
#: en/git-am.txt:152
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--resolved"
msgstr "--resolved"
@@ -14001,7 +14001,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:167 en/git-merge.txt:93 en/git-notes.txt:201
#: en/git-rebase.txt:248 en/sequencer.txt:11
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--abort"
msgstr "--abort"
@@ -14133,7 +14133,7 @@ msgstr ""
#. type: Title =
#: en/git-annotate.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-annotate(1)"
msgstr "git-annotate(1)"
@@ -14166,7 +14166,7 @@ msgstr ""
#. type: Title =
#: en/git-apply.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-apply(1)"
msgstr "git-apply(1)"
@@ -14223,7 +14223,7 @@ msgstr ""
#. type: Labeled list
#: en/git-apply.txt:41 en/git-rebase.txt:314 en/merge-options.txt:55
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--stat"
msgstr "--stat"
@@ -14261,7 +14261,7 @@ msgstr ""
#. type: Labeled list
#: en/git-apply.txt:63 en/git-checkout-index.txt:26
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--index"
msgstr "--index"
@@ -14279,7 +14279,7 @@ msgstr ""
#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29
#: en/git-grep.txt:72 en/git-ls-files.txt:36 en/git-rm.txt:58
#: en/git-submodule.txt:300
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--cached"
msgstr "--cached"
@@ -14326,7 +14326,7 @@ msgstr ""
#. type: Labeled list
#: en/git-apply.txt:97 en/rev-list-options.txt:659
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--reverse"
msgstr "--reverse"
@@ -14367,7 +14367,7 @@ msgstr ""
#. type: Labeled list
#: en/git-apply.txt:125
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--unidiff-zero"
msgstr "--unidiff-zero"
@@ -14389,7 +14389,7 @@ msgstr ""
#. type: Labeled list
#: en/git-apply.txt:135
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--apply"
msgstr "--apply"
@@ -14403,7 +14403,7 @@ msgstr ""
#. type: Labeled list
#: en/git-apply.txt:142
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-add"
msgstr "--no-add"
@@ -14418,7 +14418,7 @@ msgstr ""
#. type: Labeled list
#: en/git-apply.txt:149
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--allow-binary-replacement"
msgstr "--allow-binary-replacement"
@@ -14542,7 +14542,7 @@ msgstr ""
#. type: Labeled list
#: en/git-apply.txt:207
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--inaccurate-eof"
msgstr "--inaccurate-eof"
@@ -14565,7 +14565,7 @@ msgstr ""
#. type: Labeled list
#: en/git-apply.txt:220
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--recount"
msgstr "--recount"
@@ -14600,7 +14600,7 @@ msgstr ""
#. type: Labeled list
#: en/git-apply.txt:233
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--unsafe-paths"
msgstr "--unsafe-paths"
@@ -14674,7 +14674,7 @@ msgstr ""
#. type: Title =
#: en/git-archimport.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-archimport(1)"
msgstr "git-archimport(1)"
@@ -14812,7 +14812,7 @@ msgstr ""
#. type: Labeled list
#: en/git-archimport.txt:85 en/git-commit.txt:260 en/git-ls-files.txt:47
#: en/git-merge-index.txt:29 en/git-push.txt:159
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "-o"
msgstr "-o"
@@ -14870,7 +14870,7 @@ msgstr ""
#. type: Title =
#: en/git-archive.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-archive(1)"
msgstr "git-archive(1)"
@@ -14927,7 +14927,7 @@ msgstr ""
#. type: Labeled list
#: en/git-archive.txt:44 en/git-branch.txt:144 en/git-config.txt:160
#: en/git-show-branch.txt:80
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--list"
msgstr "--list"
@@ -14971,7 +14971,7 @@ msgstr ""
#. type: Labeled list
#: en/git-archive.txt:58
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--worktree-attributes"
msgstr "--worktree-attributes"
@@ -15063,7 +15063,7 @@ msgstr ""
#. type: Labeled list
#: en/git-archive.txt:90 en/git-diff-files.txt:28
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "-0"
msgstr "-0"
@@ -15074,7 +15074,7 @@ msgstr ""
#. type: Labeled list
#: en/git-archive.txt:92
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "-9"
msgstr "-9"
@@ -15306,7 +15306,7 @@ msgstr "linkgit:gitattributes[5]"
#. type: Title =
#: en/git-bisect.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-bisect(1)"
msgstr "git-bisect(1)"
@@ -15921,7 +15921,7 @@ msgstr ""
#. type: Labeled list
#: en/git-bisect.txt:358 en/git-clone.txt:134
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-checkout"
msgstr "--no-checkout"
@@ -16164,7 +16164,7 @@ msgstr ""
#. type: Title =
#: en/git-blame.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-blame(1)"
msgstr "git-blame(1)"
@@ -16243,7 +16243,7 @@ msgstr ""
#. type: Labeled list
#: en/git-blame.txt:55
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--score-debug"
msgstr "--score-debug"
@@ -16260,7 +16260,7 @@ msgstr ""
#. type: Labeled list
#: en/git-blame.txt:65
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--show-name"
msgstr "--show-name"
@@ -16274,7 +16274,7 @@ msgstr ""
#. type: Labeled list
#: en/git-blame.txt:71
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--show-number"
msgstr "--show-number"
@@ -16290,7 +16290,7 @@ msgstr ""
#. type: Labeled list
#: en/git-blame.txt:78
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--show-email"
msgstr "--show-email"
@@ -16597,7 +16597,7 @@ msgstr ""
#. type: Title =
#: en/git-branch.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-branch(1)"
msgstr "git-branch(1)"
@@ -16708,14 +16708,14 @@ msgstr ""
#: en/git-ls-files.txt:39 en/git-ls-tree.txt:41 en/git-repack.txt:55
#: en/git-replace.txt:64 en/git-show-ref.txt:47 en/git-symbolic-ref.txt:35
#: en/git-tag.txt:75
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "-d"
msgstr "-d"
#. type: Labeled list
#: en/git-branch.txt:79 en/git-push.txt:126 en/git-replace.txt:65
#: en/git-symbolic-ref.txt:36 en/git-tag.txt:76
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--delete"
msgstr "--delete"
@@ -16733,7 +16733,7 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:88 en/git-tag.txt:152
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--create-reflog"
msgstr "--create-reflog"
@@ -16761,7 +16761,7 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:108
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--move"
msgstr "--move"
@@ -16798,7 +16798,7 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:125 en/git-for-each-ref.txt:82 en/git-grep.txt:117
#: en/git-tag.txt:112
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--ignore-case"
msgstr "--ignore-case"
@@ -16815,7 +16815,7 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:129 en/git-status.txt:105 en/git-tag.txt:116
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-column"
msgstr "--no-column"
@@ -16834,7 +16834,7 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:137 en/git-show-branch.txt:44
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--remotes"
msgstr "--remotes"
@@ -16857,7 +16857,7 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:149
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "-vv"
msgstr "-vv"
@@ -16891,7 +16891,7 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:167
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-abbrev"
msgstr "--no-abbrev"
@@ -16903,7 +16903,7 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:171 en/git-checkout.txt:156
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--track"
msgstr "--track"
@@ -16930,7 +16930,7 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:186 en/git-checkout.txt:170
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-track"
msgstr "--no-track"
@@ -16943,7 +16943,7 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:190 en/git-push.txt:246
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--set-upstream"
msgstr "--set-upstream"
@@ -16978,7 +16978,7 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:202
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--unset-upstream"
msgstr "--unset-upstream"
@@ -16991,7 +16991,7 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:206
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--edit-description"
msgstr "--edit-description"
@@ -17254,7 +17254,7 @@ msgstr ""
#. type: Title =
#: en/git-bundle.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-bundle(1)"
msgstr "git-bundle(1)"
@@ -17603,7 +17603,7 @@ msgstr ""
#. type: Title =
#: en/git-cat-file.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-cat-file(1)"
msgstr "git-cat-file(1)"
@@ -17704,7 +17704,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:65
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--filters"
msgstr "--filters"
@@ -17733,7 +17733,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:76 en/git-mktree.txt:32
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--batch"
msgstr "--batch"
@@ -17755,7 +17755,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:84
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--batch-check"
msgstr "--batch-check"
@@ -17776,7 +17776,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:92
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--batch-all-objects"
msgstr "--batch-all-objects"
@@ -17792,7 +17792,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:99
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--buffer"
msgstr "--buffer"
@@ -17807,7 +17807,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:106
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--allow-unknown-type"
msgstr "--allow-unknown-type"
@@ -17818,7 +17818,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:109
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--follow-symlinks"
msgstr "--follow-symlinks"
@@ -17981,7 +17981,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:191
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`objectname`"
msgstr "`objectname`"
@@ -17992,7 +17992,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:194
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`objecttype`"
msgstr "`objecttype`"
@@ -18003,7 +18003,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:197
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`objectsize`"
msgstr "`objectsize`"
@@ -18027,7 +18027,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:205
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`deltabase`"
msgstr "`deltabase`"
@@ -18041,7 +18041,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:210
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`rest`"
msgstr "`rest`"
@@ -18213,7 +18213,7 @@ msgstr ""
#. type: Title =
#: en/git-check-attr.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-check-attr(1)"
msgstr "git-check-attr(1)"
@@ -18264,7 +18264,7 @@ msgstr ""
#: en/git-http-fetch.txt:40 en/git-index-pack.txt:38 en/git-name-rev.txt:45
#: en/git-notes.txt:173 en/git-send-pack.txt:41 en/git-svn.txt:564
#: en/git-update-index.txt:140 en/rev-list-options.txt:194
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--stdin"
msgstr "--stdin"
@@ -18459,7 +18459,7 @@ msgstr ""
#. type: Title =
#: en/git-check-ignore.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-check-ignore(1)"
msgstr "git-check-ignore(1)"
@@ -18542,7 +18542,7 @@ msgstr ""
#. type: Labeled list
#: en/git-check-ignore.txt:52 en/git-grep.txt:76
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-index"
msgstr "--no-index"
@@ -18660,7 +18660,7 @@ msgstr "linkgit:gitignore[5] linkgit:git-config[1] linkgit:git-ls-files[1]"
#. type: Title =
#: en/git-check-mailmap.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-check-mailmap(1)"
msgstr "git-check-mailmap(1)"
@@ -18702,7 +18702,7 @@ msgstr ""
#. type: Title =
#: en/git-checkout-index.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-checkout-index(1)"
msgstr "git-checkout-index(1)"
@@ -18753,7 +18753,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout-index.txt:44
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-create"
msgstr "--no-create"
@@ -18791,7 +18791,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout-index.txt:57
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--temp"
msgstr "--temp"
@@ -19013,7 +19013,7 @@ msgstr ""
#. type: Title =
#: en/git-checkout.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-checkout(1)"
msgstr "git-checkout(1)"
@@ -19220,13 +19220,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:125 en/git-merge-file.txt:73
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--ours"
msgstr "--ours"
#. type: Labeled list
#: en/git-checkout.txt:126 en/git-merge-file.txt:74
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--theirs"
msgstr "--theirs"
@@ -19313,7 +19313,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:178 en/git-daemon.txt:134 en/git-worktree.txt:100
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--detach"
msgstr "--detach"
@@ -19372,7 +19372,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:210
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--ignore-skip-worktree-bits"
msgstr "--ignore-skip-worktree-bits"
@@ -19387,7 +19387,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:217 en/git-rebase.txt:271 en/git-reset.txt:71
#: en/git-submodule.txt:363 en/git-svn.txt:638 en/rev-list-options.txt:278
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--merge"
msgstr "--merge"
@@ -19452,7 +19452,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:253
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--ignore-other-worktrees"
msgstr "--ignore-other-worktrees"
@@ -19915,7 +19915,7 @@ msgstr ""
#. type: Title =
#: en/git-check-ref-format.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-check-ref-format(1)"
msgstr "git-check-ref-format(1)"
@@ -20068,7 +20068,7 @@ msgstr ""
#. type: Labeled list
#: en/git-check-ref-format.txt:88
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]allow-onelevel"
msgstr "--[no-]allow-onelevel"
@@ -20082,7 +20082,7 @@ msgstr ""
#. type: Labeled list
#: en/git-check-ref-format.txt:93
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--refspec-pattern"
msgstr "--refspec-pattern"
@@ -20097,7 +20097,7 @@ msgstr ""
#. type: Labeled list
#: en/git-check-ref-format.txt:100
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--normalize"
msgstr "--normalize"
@@ -20137,7 +20137,7 @@ msgstr ""
#. type: Title =
#: en/git-cherry-pick.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-cherry-pick(1)"
msgstr "git-cherry-pick(1)"
@@ -20238,7 +20238,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cherry-pick.txt:60 en/git-clean.txt:62
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "-x"
msgstr "-x"
@@ -20287,7 +20287,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cherry-pick.txt:88 en/git-revert.txt:70 en/merge-options.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-commit"
msgstr "--no-commit"
@@ -20317,7 +20317,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cherry-pick.txt:111 en/merge-options.txt:30
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--ff"
msgstr "--ff"
@@ -20330,7 +20330,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cherry-pick.txt:116 en/git-commit.txt:173 en/git-notes.txt:158
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--allow-empty"
msgstr "--allow-empty"
@@ -20350,7 +20350,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cherry-pick.txt:129 en/git-commit.txt:179
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--allow-empty-message"
msgstr "--allow-empty-message"
@@ -20364,7 +20364,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cherry-pick.txt:134
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--keep-redundant-commits"
msgstr "--keep-redundant-commits"
@@ -20573,7 +20573,7 @@ msgstr ""
#. type: Title =
#: en/git-cherry.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-cherry(1)"
msgstr "git-cherry(1)"
@@ -20795,7 +20795,7 @@ msgstr ""
#. type: Title =
#: en/git-citool.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-citool(1)"
msgstr "git-citool(1)"
@@ -20828,7 +20828,7 @@ msgstr ""
#. type: Title =
#: en/git-clean.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-clean(1)"
msgstr "git-clean(1)"
@@ -21065,7 +21065,7 @@ msgstr "linkgit:gitignore[5]"
#. type: Title =
#: en/git-clone.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-clone(1)"
msgstr "git-clone(1)"
@@ -21116,7 +21116,7 @@ msgstr ""
#. type: Labeled list
#: en/git-clone.txt:43 en/git-config.txt:127 en/git-instaweb.txt:24
#: en/git-pack-objects.txt:127 en/git-svn.txt:229
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--local"
msgstr "--local"
@@ -21142,7 +21142,7 @@ msgstr ""
#. type: Labeled list
#: en/git-clone.txt:59
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-hardlinks"
msgstr "--no-hardlinks"
@@ -21157,7 +21157,7 @@ msgstr ""
#. type: Labeled list
#: en/git-clone.txt:65
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--shared"
msgstr "--shared"
@@ -21230,7 +21230,7 @@ msgstr ""
#. type: Labeled list
#: en/git-clone.txt:107
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--dissociate"
msgstr "--dissociate"
@@ -21266,7 +21266,7 @@ msgstr ""
#. type: Labeled list
#: en/git-clone.txt:138 en/git-init.txt:48 en/git-p4.txt:268 en/git.txt:624
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--bare"
msgstr "--bare"
@@ -21285,7 +21285,7 @@ msgstr ""
#. type: Labeled list
#: en/git-clone.txt:150 en/git-push.txt:106
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--mirror"
msgstr "--mirror"
@@ -21421,7 +21421,7 @@ msgstr ""
#. type: Labeled list
#: en/git-clone.txt:208
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]single-branch"
msgstr "--[no-]single-branch"
@@ -21438,13 +21438,13 @@ msgstr ""
#. type: Labeled list
#: en/git-clone.txt:218 en/git-submodule.txt:400
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--recursive"
msgstr "--recursive"
#. type: Labeled list
#: en/git-clone.txt:219 en/git-grep.txt:92 en/git-ls-files.txt:142
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--recurse-submodules"
msgstr "--recurse-submodules"
@@ -21460,7 +21460,7 @@ msgstr ""
#. type: Labeled list
#: en/git-clone.txt:227
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]shallow-submodules"
msgstr "--[no-]shallow-submodules"
@@ -21592,7 +21592,7 @@ msgstr ""
#. type: Title =
#: en/git-column.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-column(1)"
msgstr "git-column(1)"
@@ -21701,7 +21701,7 @@ msgstr ""
#. type: Title =
#: en/git-commit-tree.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-commit-tree(1)"
msgstr "git-commit-tree(1)"
@@ -21809,7 +21809,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit-tree.txt:63 en/git-commit.txt:332
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-gpg-sign"
msgstr "--no-gpg-sign"
@@ -21911,7 +21911,7 @@ msgstr ""
#. type: Title =
#: en/git-commit.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-commit(1)"
msgstr "git-commit(1)"
@@ -22084,7 +22084,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:96
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--reset-author"
msgstr "--reset-author"
@@ -22099,7 +22099,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:102 en/git-rev-parse.txt:139 en/git-status.txt:28
#: en/git-symbolic-ref.txt:45
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--short"
msgstr "--short"
@@ -22112,7 +22112,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:106 en/git-status.txt:32 en/git-submodule.txt:280
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--branch"
msgstr "--branch"
@@ -22131,7 +22131,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:114 en/git-describe.txt:74 en/git-ls-tree.txt:52
#: en/git-status.txt:44
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--long"
msgstr "--long"
@@ -22144,7 +22144,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:119 en/git-config.txt:184 en/git-grep.txt:197
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--null"
msgstr "--null"
@@ -22254,7 +22254,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:169 en/git-rebase.txt:322
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-verify"
msgstr "--no-verify"
@@ -22376,7 +22376,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:219 en/git-revert.txt:65 en/merge-options.txt:12
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-edit"
msgstr "--no-edit"
@@ -22390,7 +22390,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:224
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--amend"
msgstr "--amend"
@@ -22435,7 +22435,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:250
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-post-rewrite"
msgstr "--no-post-rewrite"
@@ -22446,7 +22446,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:254
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--include"
msgstr "--include"
@@ -22460,7 +22460,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:261
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--only"
msgstr "--only"
@@ -22567,7 +22567,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:315
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--status"
msgstr "--status"
@@ -22581,7 +22581,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:321
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-status"
msgstr "--no-status"
@@ -22808,7 +22808,7 @@ msgstr ""
#. type: Title =
#: en/git-config.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-config(1)"
msgstr "git-config(1)"
@@ -22936,7 +22936,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:74
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--replace-all"
msgstr "--replace-all"
@@ -22949,7 +22949,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:78 en/git-update-index.txt:42
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--add"
msgstr "--add"
@@ -22962,7 +22962,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:83
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--get"
msgstr "--get"
@@ -22976,7 +22976,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:88
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--get-all"
msgstr "--get-all"
@@ -22987,7 +22987,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:91
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--get-regexp"
msgstr "--get-regexp"
@@ -23018,7 +23018,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:106
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--global"
msgstr "--global"
@@ -23045,7 +23045,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:117
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--system"
msgstr "--system"
@@ -23112,7 +23112,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:147
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--remove-section"
msgstr "--remove-section"
@@ -23123,7 +23123,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:150
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--rename-section"
msgstr "--rename-section"
@@ -23134,7 +23134,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:153
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--unset"
msgstr "--unset"
@@ -23145,7 +23145,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:156
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--unset-all"
msgstr "--unset-all"
@@ -23161,7 +23161,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:163
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--bool"
msgstr "--bool"
@@ -23172,7 +23172,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:166
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--int"
msgstr "--int"
@@ -23186,7 +23186,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:172
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--bool-or-int"
msgstr "--bool-or-int"
@@ -23199,7 +23199,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:176 en/git-hash-object.txt:41
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--path"
msgstr "--path"
@@ -23229,7 +23229,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:196
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--show-origin"
msgstr "--show-origin"
@@ -23283,7 +23283,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:225
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]includes"
msgstr "--[no-]includes"
@@ -23404,7 +23404,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:282
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "GIT_CONFIG"
msgstr "GIT_CONFIG"
@@ -23418,7 +23418,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:287
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "GIT_CONFIG_NOSYSTEM"
msgstr "GIT_CONFIG_NOSYSTEM"
@@ -23666,7 +23666,7 @@ msgstr ""
#. type: Title =
#: en/git-count-objects.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-count-objects(1)"
msgstr "git-count-objects(1)"
@@ -23755,7 +23755,7 @@ msgstr ""
#. type: Labeled list
#: en/git-count-objects.txt:48
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--human-readable"
msgstr "--human-readable"
@@ -23766,7 +23766,7 @@ msgstr ""
#. type: Title =
#: en/git-credential-cache--daemon.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-credential-cache--daemon(1)"
msgstr "git-credential-cache--daemon(1)"
@@ -23808,7 +23808,7 @@ msgstr ""
#. type: Title =
#: en/git-credential-cache.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-credential-cache(1)"
msgstr "git-credential-cache(1)"
@@ -23926,7 +23926,7 @@ msgstr ""
#. type: Title =
#: en/git-credential-store.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-credential-store(1)"
msgstr "git-credential-store(1)"
@@ -24090,7 +24090,7 @@ msgstr ""
#. type: Title =
#: en/git-credential.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-credential(1)"
msgstr "git-credential(1)"
@@ -24280,7 +24280,7 @@ msgstr ""
#. type: Labeled list
#: en/git-credential.txt:120
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`protocol`"
msgstr "`protocol`"
@@ -24291,7 +24291,7 @@ msgstr ""
#. type: Labeled list
#: en/git-credential.txt:125
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`host`"
msgstr "`host`"
@@ -24302,7 +24302,7 @@ msgstr ""
#. type: Labeled list
#: en/git-credential.txt:129
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`path`"
msgstr "`path`"
@@ -24315,7 +24315,7 @@ msgstr ""
#. type: Labeled list
#: en/git-credential.txt:135
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`username`"
msgstr "`username`"
@@ -24328,7 +24328,7 @@ msgstr ""
#. type: Labeled list
#: en/git-credential.txt:140
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`password`"
msgstr "`password`"
@@ -24339,7 +24339,7 @@ msgstr ""
#. type: Labeled list
#: en/git-credential.txt:144
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`url`"
msgstr "`url`"
@@ -24358,7 +24358,7 @@ msgstr ""
#. type: Title =
#: en/git-cvsexportcommit.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-cvsexportcommit(1)"
msgstr "git-cvsexportcommit(1)"
@@ -24556,7 +24556,7 @@ msgstr ""
#. type: Title =
#: en/git-cvsimport.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-cvsimport(1)"
msgstr "git-cvsimport(1)"
@@ -25030,7 +25030,7 @@ msgstr ""
#. type: Title =
#: en/git-cvsserver.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-cvsserver(1)"
msgstr "git-cvsserver(1)"
@@ -25097,7 +25097,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cvsserver.txt:37 en/git-daemon.txt:48
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--strict-paths"
msgstr "--strict-paths"
@@ -25108,7 +25108,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cvsserver.txt:40 en/git-daemon.txt:77
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--export-all"
msgstr "--export-all"
@@ -25127,7 +25127,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cvsserver.txt:45 en/git.txt:534
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--version"
msgstr "--version"
@@ -25138,7 +25138,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cvsserver.txt:50 en/git.txt:537
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--help"
msgstr "--help"
@@ -25871,7 +25871,7 @@ msgstr ""
#. type: Title =
#: en/git-daemon.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-daemon(1)"
msgstr "git-daemon(1)"
@@ -25963,7 +25963,7 @@ msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:61
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--base-path-relaxed"
msgstr "--base-path-relaxed"
@@ -26003,7 +26003,7 @@ msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:82
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--inetd"
msgstr "--inetd"
@@ -26084,7 +26084,7 @@ msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:112
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--syslog"
msgstr "--syslog"
@@ -26097,7 +26097,7 @@ msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:116
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--user-path"
msgstr "--user-path"
@@ -26124,7 +26124,7 @@ msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:129
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--reuseaddr"
msgstr "--reuseaddr"
@@ -26234,7 +26234,7 @@ msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:174
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]informative-errors"
msgstr "--[no-]informative-errors"
@@ -26483,7 +26483,7 @@ msgstr ""
#. type: Title =
#: en/git-describe.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-describe(1)"
msgstr "git-describe(1)"
@@ -26559,7 +26559,7 @@ msgstr ""
#. type: Labeled list
#: en/git-describe.txt:47
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--contains"
msgstr "--contains"
@@ -26595,7 +26595,7 @@ msgstr ""
#. type: Labeled list
#: en/git-describe.txt:65
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--exact-match"
msgstr "--exact-match"
@@ -26608,7 +26608,7 @@ msgstr ""
#. type: Labeled list
#: en/git-describe.txt:69 en/git-ls-files.txt:151
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--debug"
msgstr "--debug"
@@ -26667,7 +26667,7 @@ msgstr ""
#. type: Labeled list
#: en/git-describe.txt:101 en/git-diff-tree.txt:111 en/git-name-rev.txt:61
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--always"
msgstr "--always"
@@ -26678,7 +26678,7 @@ msgstr ""
#. type: Labeled list
#: en/git-describe.txt:104 en/rev-list-options.txt:121
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--first-parent"
msgstr "--first-parent"
@@ -26823,7 +26823,7 @@ msgstr ""
#. type: Title =
#: en/git-diff-files.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-diff-files(1)"
msgstr "git-diff-files(1)"
@@ -26885,7 +26885,7 @@ msgstr ""
#. type: Labeled list
#: en/git-diff-files.txt:38 en/git-diff-tree.txt:101
#: en/rev-list-options.txt:873
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--cc"
msgstr "--cc"
@@ -26904,7 +26904,7 @@ msgstr ""
#. type: Title =
#: en/git-diff-index.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-diff-index(1)"
msgstr "git-diff-index(1)"
@@ -27115,7 +27115,7 @@ msgstr ""
#. type: Title =
#: en/git-difftool.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-difftool(1)"
msgstr "git-difftool(1)"
@@ -27141,7 +27141,7 @@ msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:23
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--dir-diff"
msgstr "--dir-diff"
@@ -27154,13 +27154,13 @@ msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:28 en/git-mergetool.txt:70
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "-y"
msgstr "-y"
#. type: Labeled list
#: en/git-difftool.txt:29 en/git-mergetool.txt:71
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-prompt"
msgstr "--no-prompt"
@@ -27171,7 +27171,7 @@ msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:32 en/git-mergetool.txt:78
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--prompt"
msgstr "--prompt"
@@ -27242,7 +27242,7 @@ msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:69 en/git-mergetool.txt:67
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--tool-help"
msgstr "--tool-help"
@@ -27253,7 +27253,7 @@ msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:72
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]symlinks"
msgstr "--[no-]symlinks"
@@ -27295,13 +27295,13 @@ msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:88 en/git-help.txt:46 en/git-show-branch.txt:111
#: en/git-update-index.txt:114 en/rev-list-options.txt:245
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "-g"
msgstr "-g"
#. type: Labeled list
#: en/git-difftool.txt:89
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]gui"
msgstr "--[no-]gui"
@@ -27315,7 +27315,7 @@ msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:95
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]trust-exit-code"
msgstr "--[no-]trust-exit-code"
@@ -27360,7 +27360,7 @@ msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:114
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "diff.guitool"
msgstr "diff.guitool"
@@ -27381,7 +27381,7 @@ msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:129
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "difftool.trustExitCode"
msgstr "difftool.trustExitCode"
@@ -27412,7 +27412,7 @@ msgstr ""
#. type: Title =
#: en/git-diff-tree.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-diff-tree(1)"
msgstr "git-diff-tree(1)"
@@ -27545,7 +27545,7 @@ msgstr ""
#. type: Labeled list
#: en/git-diff-tree.txt:87
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-commit-id"
msgstr "--no-commit-id"
@@ -27688,7 +27688,7 @@ msgstr ""
#. type: Title =
#: en/git-diff.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-diff(1)"
msgstr "git-diff(1)"
@@ -28020,7 +28020,7 @@ msgstr ""
#. type: Title =
#: en/git-fast-export.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-fast-export(1)"
msgstr "git-fast-export(1)"
@@ -28174,7 +28174,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:84
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--fake-missing-tagger"
msgstr "--fake-missing-tagger"
@@ -28188,7 +28188,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:90
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--use-done-feature"
msgstr "--use-done-feature"
@@ -28201,7 +28201,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:94
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-data"
msgstr "--no-data"
@@ -28217,7 +28217,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:102 en/git-ls-tree.txt:72
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--full-tree"
msgstr "--full-tree"
@@ -28232,7 +28232,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:108
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--anonymize"
msgstr "--anonymize"
@@ -28245,7 +28245,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:113
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--refspec"
msgstr "--refspec"
@@ -28413,7 +28413,7 @@ msgstr ""
#. type: Title =
#: en/git-fast-import.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-fast-import(1)"
msgstr "git-fast-import(1)"
@@ -28472,7 +28472,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:47
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--stats"
msgstr "--stats"
@@ -28521,7 +28521,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:68
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--done"
msgstr "--done"
@@ -28574,7 +28574,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:98
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]relative-marks"
msgstr "--[no-]relative-marks"
@@ -28841,7 +28841,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:238
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`raw`"
msgstr "`raw`"
@@ -28943,7 +28943,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:291
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`now`"
msgstr "`now`"
@@ -28996,7 +28996,7 @@ msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:318 en/git-fast-import.txt:380
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`commit`"
msgstr "`commit`"
@@ -29009,7 +29009,7 @@ msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:323 en/git-fast-import.txt:744
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`tag`"
msgstr "`tag`"
@@ -29023,7 +29023,7 @@ msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:329 en/git-fast-import.txt:787
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`reset`"
msgstr "`reset`"
@@ -29037,7 +29037,7 @@ msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:334 en/git-fast-import.txt:816
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`blob`"
msgstr "`blob`"
@@ -29050,7 +29050,7 @@ msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:339 en/git-fast-import.txt:888
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`checkpoint`"
msgstr "`checkpoint`"
@@ -29064,7 +29064,7 @@ msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:345 en/git-fast-import.txt:916
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`progress`"
msgstr "`progress`"
@@ -29077,7 +29077,7 @@ msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:350 en/git-fast-import.txt:1126
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`done`"
msgstr "`done`"
@@ -29091,7 +29091,7 @@ msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:355 en/git-fast-import.txt:941
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`get-mark`"
msgstr "`get-mark`"
@@ -29104,7 +29104,7 @@ msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:360 en/git-fast-import.txt:960
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`cat-blob`"
msgstr "`cat-blob`"
@@ -29117,7 +29117,7 @@ msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:365 en/git-fast-import.txt:990
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`ls`"
msgstr "`ls`"
@@ -29131,7 +29131,7 @@ msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:370 en/git-fast-import.txt:1043
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`feature`"
msgstr "`feature`"
@@ -29144,7 +29144,7 @@ msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:374 en/git-fast-import.txt:1098
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`option`"
msgstr "`option`"
@@ -29229,7 +29229,7 @@ msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:426
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`author`"
msgstr "`author`"
@@ -29245,7 +29245,7 @@ msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:434
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`committer`"
msgstr "`committer`"
@@ -29278,7 +29278,7 @@ msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:452
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`from`"
msgstr "`from`"
@@ -29388,7 +29388,7 @@ msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:509
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`merge`"
msgstr "`merge`"
@@ -29412,7 +29412,7 @@ msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:522
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`filemodify`"
msgstr "`filemodify`"
@@ -29584,7 +29584,7 @@ msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:594
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`filedelete`"
msgstr "`filedelete`"
@@ -29614,7 +29614,7 @@ msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:610
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`filecopy`"
msgstr "`filecopy`"
@@ -29652,7 +29652,7 @@ msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:631
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`filerename`"
msgstr "`filerename`"
@@ -29693,7 +29693,7 @@ msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:660
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`filedeleteall`"
msgstr "`filedeleteall`"
@@ -29733,7 +29733,7 @@ msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:684
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`notemodify`"
msgstr "`notemodify`"
@@ -29794,7 +29794,7 @@ msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:723
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`mark`"
msgstr "`mark`"
@@ -29980,7 +29980,7 @@ msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:834
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`data`"
msgstr "`data`"
@@ -31137,7 +31137,7 @@ msgstr ""
#. type: Title =
#: en/git-fetch-pack.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-fetch-pack(1)"
msgstr "git-fetch-pack(1)"
@@ -31219,7 +31219,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fetch-pack.txt:60 en/git-pack-objects.txt:184
#: en/git-send-pack.txt:64
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--thin"
msgstr "--thin"
@@ -31232,7 +31232,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fetch-pack.txt:64 en/git-pack-objects.txt:81
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--include-tag"
msgstr "--include-tag"
@@ -31292,7 +31292,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fetch-pack.txt:99
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--deepen-relative"
msgstr "--deepen-relative"
@@ -31305,7 +31305,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fetch-pack.txt:104 en/merge-options.txt:113
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-progress"
msgstr "--no-progress"
@@ -31316,7 +31316,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fetch-pack.txt:107 en/git-index-pack.txt:77
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--check-self-contained-and-connected"
msgstr "--check-self-contained-and-connected"
@@ -31361,7 +31361,7 @@ msgstr ""
#. type: Title =
#: en/git-fetch.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-fetch(1)"
msgstr "git-fetch(1)"
@@ -31564,7 +31564,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fetch.txt:128 en/git-push.txt:332
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`-`"
msgstr "`-`"
@@ -31575,7 +31575,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fetch.txt:129
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`t`"
msgstr "`t`"
@@ -31761,7 +31761,7 @@ msgstr ""
#. type: Title =
#: en/git-filter-branch.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-filter-branch(1)"
msgstr "git-filter-branch(1)"
@@ -32053,7 +32053,7 @@ msgstr ""
#. type: Labeled list
#: en/git-filter-branch.txt:169
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--prune-empty"
msgstr "--prune-empty"
@@ -32544,7 +32544,7 @@ msgstr ""
#. type: Title =
#: en/git-fmt-merge-msg.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-fmt-merge-msg(1)"
msgstr "git-fmt-merge-msg(1)"
@@ -32593,7 +32593,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fmt-merge-msg.txt:34 en/merge-options.txt:46
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-log"
msgstr "--no-log"
@@ -32605,7 +32605,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fmt-merge-msg.txt:38
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]summary"
msgstr "--[no-]summary"
@@ -32642,7 +32642,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fmt-merge-msg.txt:56
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "merge.summary"
msgstr "merge.summary"
@@ -32670,7 +32670,7 @@ msgstr ""
#. type: Title =
#: en/git-for-each-ref.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-for-each-ref(1)"
msgstr "git-for-each-ref(1)"
@@ -32761,25 +32761,25 @@ msgstr ""
#. type: Labeled list
#: en/git-for-each-ref.txt:58
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--shell"
msgstr "--shell"
#. type: Labeled list
#: en/git-for-each-ref.txt:59
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--perl"
msgstr "--perl"
#. type: Labeled list
#: en/git-for-each-ref.txt:60
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--python"
msgstr "--python"
#. type: Labeled list
#: en/git-for-each-ref.txt:61
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--tcl"
msgstr "--tcl"
@@ -33284,7 +33284,7 @@ msgstr ""
#. type: Title =
#: en/git-format-patch.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-format-patch(1)"
msgstr "git-format-patch(1)"
@@ -33432,7 +33432,7 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:94 en/git-shortlog.txt:30
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--numbered"
msgstr "--numbered"
@@ -33443,7 +33443,7 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:98
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-numbered"
msgstr "--no-numbered"
@@ -33465,7 +33465,7 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:104
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--numbered-files"
msgstr "--numbered-files"
@@ -33478,7 +33478,7 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:109
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--keep-subject"
msgstr "--keep-subject"
@@ -33498,7 +33498,7 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:119 en/git-pack-objects.txt:57
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--stdout"
msgstr "--stdout"
@@ -33525,7 +33525,7 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:128
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-attach"
msgstr "--no-attach"
@@ -33557,7 +33557,7 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:138
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-thread"
msgstr "--no-thread"
@@ -33611,7 +33611,7 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:163
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--ignore-if-in-upstream"
msgstr "--ignore-if-in-upstream"
@@ -33640,7 +33640,7 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:176
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--rfc"
msgstr "--rfc"
@@ -33704,7 +33704,7 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:202
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--from"
msgstr "--from"
@@ -33751,7 +33751,7 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:225
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]cover-letter"
msgstr "--[no-]cover-letter"
@@ -33841,7 +33841,7 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:264
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-binary"
msgstr "--no-binary"
@@ -33855,7 +33855,7 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:270
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--zero-commit"
msgstr "--zero-commit"
@@ -34534,7 +34534,7 @@ msgstr "linkgit:git-am[1], linkgit:git-send-email[1]"
#. type: Title =
#: en/git-fsck-objects.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-fsck-objects(1)"
msgstr "git-fsck-objects(1)"
@@ -34560,7 +34560,7 @@ msgstr ""
#. type: Title =
#: en/git-fsck.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-fsck(1)"
msgstr "git-fsck(1)"
@@ -34596,7 +34596,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:30
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--unreachable"
msgstr "--unreachable"
@@ -34609,7 +34609,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:34
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]dangling"
msgstr "--[no-]dangling"
@@ -34632,7 +34632,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:44
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--cache"
msgstr "--cache"
@@ -34645,7 +34645,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:48
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-reflogs"
msgstr "--no-reflogs"
@@ -34659,7 +34659,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:54
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--full"
msgstr "--full"
@@ -34676,7 +34676,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:64
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--connectivity-only"
msgstr "--connectivity-only"
@@ -34690,7 +34690,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:69 en/git-index-pack.txt:74 en/git-unpack-objects.txt:44
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--strict"
msgstr "--strict"
@@ -34711,7 +34711,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:80
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--lost-found"
msgstr "--lost-found"
@@ -34725,7 +34725,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:86
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--name-objects"
msgstr "--name-objects"
@@ -34859,7 +34859,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:148
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "GIT_OBJECT_DIRECTORY"
msgstr "GIT_OBJECT_DIRECTORY"
@@ -34870,7 +34870,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:151
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "GIT_INDEX_FILE"
msgstr "GIT_INDEX_FILE"
@@ -34881,7 +34881,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:154
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "GIT_ALTERNATE_OBJECT_DIRECTORIES"
msgstr "GIT_ALTERNATE_OBJECT_DIRECTORIES"
@@ -34892,7 +34892,7 @@ msgstr ""
#. type: Title =
#: en/git-gc.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-gc(1)"
msgstr "git-gc(1)"
@@ -34942,7 +34942,7 @@ msgstr ""
#. type: Labeled list
#: en/git-gc.txt:36 en/git-read-tree.txt:71
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--aggressive"
msgstr "--aggressive"
@@ -34958,7 +34958,7 @@ msgstr ""
#. type: Labeled list
#: en/git-gc.txt:44
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--auto"
msgstr "--auto"
@@ -35007,7 +35007,7 @@ msgstr ""
#. type: Labeled list
#: en/git-gc.txt:71 en/git-pack-refs.txt:57
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-prune"
msgstr "--no-prune"
@@ -35182,7 +35182,7 @@ msgstr ""
#. type: Title =
#: en/git-get-tar-commit-id.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-get-tar-commit-id(1)"
msgstr "git-get-tar-commit-id(1)"
@@ -35219,7 +35219,7 @@ msgstr ""
#. type: Title =
#: en/git-grep.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-grep(1)"
msgstr "git-grep(1)"
@@ -35295,7 +35295,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:79
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--untracked"
msgstr "--untracked"
@@ -35308,7 +35308,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:83
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-exclude-standard"
msgstr "--no-exclude-standard"
@@ -35321,7 +35321,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:87 en/git-ls-files.txt:97
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--exclude-standard"
msgstr "--exclude-standard"
@@ -35406,7 +35406,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:132
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--word-regexp"
msgstr "--word-regexp"
@@ -35420,7 +35420,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:138
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--invert-match"
msgstr "--invert-match"
@@ -35439,7 +35439,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:149 en/git-ls-files.txt:136 en/git-ls-tree.txt:68
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--full-name"
msgstr "--full-name"
@@ -35459,7 +35459,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:156 en/rev-list-options.txt:85
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--extended-regexp"
msgstr "--extended-regexp"
@@ -35471,7 +35471,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:158 en/rev-list-options.txt:80
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--basic-regexp"
msgstr "--basic-regexp"
@@ -35484,7 +35484,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:163 en/rev-list-options.txt:94
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--perl-regexp"
msgstr "--perl-regexp"
@@ -35502,7 +35502,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:168 en/rev-list-options.txt:90
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--fixed-strings"
msgstr "--fixed-strings"
@@ -35513,7 +35513,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:173
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--line-number"
msgstr "--line-number"
@@ -35524,7 +35524,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:177
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--files-with-matches"
msgstr "--files-with-matches"
@@ -35536,7 +35536,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:180
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--files-without-match"
msgstr "--files-without-match"
@@ -35578,7 +35578,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:202 en/rev-list-options.txt:848
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--count"
msgstr "--count"
@@ -35604,7 +35604,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:215
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--break"
msgstr "--break"
@@ -35615,7 +35615,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:218
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--heading"
msgstr "--heading"
@@ -35628,7 +35628,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:223
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--show-function"
msgstr "--show-function"
@@ -35746,19 +35746,19 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:266
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--and"
msgstr "--and"
#. type: Labeled list
#: en/git-grep.txt:267
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--or"
msgstr "--or"
#. type: Labeled list
#: en/git-grep.txt:268 en/git-rev-parse.txt:129 en/rev-list-options.txt:131
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--not"
msgstr "--not"
@@ -35778,7 +35778,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:275 en/rev-list-options.txt:67
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--all-match"
msgstr "--all-match"
@@ -35863,7 +35863,7 @@ msgstr ""
#. type: Title =
#: en/git-gui.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-gui(1)"
msgstr "git-gui(1)"
@@ -36117,7 +36117,7 @@ msgstr ""
#. type: Title =
#: en/git-hash-object.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-hash-object(1)"
msgstr "git-hash-object(1)"
@@ -36170,7 +36170,7 @@ msgstr ""
#. type: Labeled list
#: en/git-hash-object.txt:37
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--stdin-paths"
msgstr "--stdin-paths"
@@ -36195,7 +36195,7 @@ msgstr ""
#. type: Labeled list
#: en/git-hash-object.txt:51
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-filters"
msgstr "--no-filters"
@@ -36210,7 +36210,7 @@ msgstr ""
#. type: Labeled list
#: en/git-hash-object.txt:57
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--literally"
msgstr "--literally"
@@ -36225,7 +36225,7 @@ msgstr ""
#. type: Title =
#: en/git-help.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-help(1)"
msgstr "git-help(1)"
@@ -36298,7 +36298,7 @@ msgstr ""
#. type: Labeled list
#: en/git-help.txt:47
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--guides"
msgstr "--guides"
@@ -36311,7 +36311,7 @@ msgstr ""
#. type: Labeled list
#: en/git-help.txt:52
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--info"
msgstr "--info"
@@ -36324,7 +36324,7 @@ msgstr ""
#. type: Labeled list
#: en/git-help.txt:57
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--man"
msgstr "--man"
@@ -36345,7 +36345,7 @@ msgstr ""
#. type: Labeled list
#: en/git-help.txt:67
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--web"
msgstr "--web"
@@ -36576,7 +36576,7 @@ msgstr ""
#. type: Title =
#: en/git-http-backend.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-http-backend(1)"
msgstr "git-http-backend(1)"
@@ -37053,7 +37053,7 @@ msgstr ""
#. type: Title =
#: en/git-http-fetch.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-http-fetch(1)"
msgstr "git-http-fetch(1)"
@@ -37142,7 +37142,7 @@ msgstr ""
#. type: Labeled list
#: en/git-http-fetch.txt:46
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--recover"
msgstr "--recover"
@@ -37155,7 +37155,7 @@ msgstr ""
#. type: Title =
#: en/git-http-push.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-http-push(1)"
msgstr "git-http-push(1)"
@@ -37322,7 +37322,7 @@ msgstr ""
#. type: Title =
#: en/git-imap-send.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-imap-send(1)"
msgstr "git-imap-send(1)"
@@ -37365,7 +37365,7 @@ msgstr ""
#. type: Labeled list
#: en/git-imap-send.txt:40
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--curl"
msgstr "--curl"
@@ -37378,7 +37378,7 @@ msgstr ""
#. type: Labeled list
#: en/git-imap-send.txt:45
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-curl"
msgstr "--no-curl"
@@ -37644,7 +37644,7 @@ msgstr ""
#. type: Title =
#: en/git-index-pack.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-index-pack(1)"
msgstr "git-index-pack(1)"
@@ -37703,7 +37703,7 @@ msgstr ""
#. type: Labeled list
#: en/git-index-pack.txt:48
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--fix-thin"
msgstr "--fix-thin"
@@ -37821,7 +37821,7 @@ msgstr ""
#. type: Title =
#: en/git-init-db.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-init-db(1)"
msgstr "git-init-db(1)"
@@ -37847,7 +37847,7 @@ msgstr ""
#. type: Title =
#: en/git-init.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-init(1)"
msgstr "git-init(1)"
@@ -38122,7 +38122,7 @@ msgstr ""
#. type: Title =
#: en/git-instaweb.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-instaweb(1)"
msgstr "git-instaweb(1)"
@@ -38154,7 +38154,7 @@ msgstr ""
#. type: Labeled list
#: en/git-instaweb.txt:28
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--httpd"
msgstr "--httpd"
@@ -38169,7 +38169,7 @@ msgstr ""
#. type: Labeled list
#: en/git-instaweb.txt:36
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--module-path"
msgstr "--module-path"
@@ -38182,7 +38182,7 @@ msgstr ""
#. type: Labeled list
#: en/git-instaweb.txt:41
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--port"
msgstr "--port"
@@ -38193,7 +38193,7 @@ msgstr ""
#. type: Labeled list
#: en/git-instaweb.txt:45
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--browser"
msgstr "--browser"
@@ -38214,7 +38214,7 @@ msgstr ""
#. type: Labeled list
#: en/git-instaweb.txt:53
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--start"
msgstr "--start"
@@ -38233,7 +38233,7 @@ msgstr ""
#. type: Labeled list
#: en/git-instaweb.txt:58
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--stop"
msgstr "--stop"
@@ -38253,7 +38253,7 @@ msgstr ""
#. type: Labeled list
#: en/git-instaweb.txt:64
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--restart"
msgstr "--restart"
@@ -38291,7 +38291,7 @@ msgstr ""
#. type: Title =
#: en/git-interpret-trailers.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-interpret-trailers(1)"
msgstr "git-interpret-trailers(1)"
@@ -38401,7 +38401,7 @@ msgstr ""
#. type: Labeled list
#: en/git-interpret-trailers.txt:70
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--in-place"
msgstr "--in-place"
@@ -38412,7 +38412,7 @@ msgstr ""
#. type: Labeled list
#: en/git-interpret-trailers.txt:73
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--trim-empty"
msgstr "--trim-empty"
@@ -38923,7 +38923,7 @@ msgstr ""
#. type: Title =
#: en/git-log.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-log(1)"
msgstr "git-log(1)"
@@ -38953,7 +38953,7 @@ msgstr ""
#. type: Labeled list
#: en/git-log.txt:27
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--follow"
msgstr "--follow"
@@ -38966,7 +38966,7 @@ msgstr ""
#. type: Labeled list
#: en/git-log.txt:31
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-decorate"
msgstr "--no-decorate"
@@ -38989,7 +38989,7 @@ msgstr ""
#. type: Labeled list
#: en/git-log.txt:41
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--source"
msgstr "--source"
@@ -39002,7 +39002,7 @@ msgstr ""
#. type: Labeled list
#: en/git-log.txt:45
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--use-mailmap"
msgstr "--use-mailmap"
@@ -39015,7 +39015,7 @@ msgstr ""
#. type: Labeled list
#: en/git-log.txt:50
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--full-diff"
msgstr "--full-diff"
@@ -39038,7 +39038,7 @@ msgstr ""
#. type: Labeled list
#: en/git-log.txt:60
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--log-size"
msgstr "--log-size"
@@ -39284,7 +39284,7 @@ msgstr ""
#. type: Labeled list
#: en/git-log.txt:201
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "log.showSignature"
msgstr "log.showSignature"
@@ -39332,7 +39332,7 @@ msgstr ""
#. type: Title =
#: en/git-ls-files.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-ls-files(1)"
msgstr "git-ls-files(1)"
@@ -39380,7 +39380,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:40
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--deleted"
msgstr "--deleted"
@@ -39391,7 +39391,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:44
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--modified"
msgstr "--modified"
@@ -39402,7 +39402,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:48
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--others"
msgstr "--others"
@@ -39413,7 +39413,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:52 en/git-status.txt:97
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--ignored"
msgstr "--ignored"
@@ -39427,7 +39427,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:59
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--stage"
msgstr "--stage"
@@ -39439,7 +39439,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:62
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--directory"
msgstr "--directory"
@@ -39452,7 +39452,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:66
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-empty-directory"
msgstr "--no-empty-directory"
@@ -39463,7 +39463,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:70 en/git-update-index.txt:65
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--unmerged"
msgstr "--unmerged"
@@ -39474,7 +39474,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:74
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--killed"
msgstr "--killed"
@@ -39544,7 +39544,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:101
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--error-unmatch"
msgstr "--error-unmatch"
@@ -39697,7 +39697,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:157
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--eol"
msgstr "--eol"
@@ -39852,7 +39852,7 @@ msgstr "linkgit:git-read-tree[1], linkgit:gitignore[5]"
#. type: Title =
#: en/git-ls-remote.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-ls-remote(1)"
msgstr "git-ls-remote(1)"
@@ -39879,7 +39879,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-remote.txt:25 en/git-show-ref.txt:41
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--heads"
msgstr "--heads"
@@ -39893,7 +39893,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-remote.txt:33
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--refs"
msgstr "--refs"
@@ -39932,7 +39932,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-remote.txt:52
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--get-url"
msgstr "--get-url"
@@ -39946,7 +39946,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-remote.txt:57
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--symref"
msgstr "--symref"
@@ -39997,7 +39997,7 @@ msgstr ""
#. type: Title =
#: en/git-ls-tree.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-ls-tree(1)"
msgstr "git-ls-tree(1)"
@@ -40151,7 +40151,7 @@ msgstr ""
#. type: Title =
#: en/git-mailinfo.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-mailinfo(1)"
msgstr "git-mailinfo(1)"
@@ -40322,7 +40322,7 @@ msgstr ""
#. type: Title =
#: en/git-mailsplit.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-mailsplit(1)"
msgstr "git-mailsplit(1)"
@@ -40424,7 +40424,7 @@ msgstr ""
#. type: Labeled list
#: en/git-mailsplit.txt:48
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--keep-cr"
msgstr "--keep-cr"
@@ -40435,7 +40435,7 @@ msgstr ""
#. type: Labeled list
#: en/git-mailsplit.txt:51
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--mboxrd"
msgstr "--mboxrd"
@@ -40446,7 +40446,7 @@ msgstr ""
#. type: Title =
#: en/git-merge-base.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-merge-base(1)"
msgstr "git-merge-base(1)"
@@ -40510,7 +40510,7 @@ msgstr ""
#. type: Labeled list
#: en/git-merge-base.txt:43
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--octopus"
msgstr "--octopus"
@@ -40524,7 +40524,7 @@ msgstr ""
#. type: Labeled list
#: en/git-merge-base.txt:48 en/git-show-branch.txt:90
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--independent"
msgstr "--independent"
@@ -40539,7 +40539,7 @@ msgstr ""
#. type: Labeled list
#: en/git-merge-base.txt:55
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--is-ancestor"
msgstr "--is-ancestor"
@@ -40553,7 +40553,7 @@ msgstr ""
#. type: Labeled list
#: en/git-merge-base.txt:60 en/git-rebase.txt:346
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--fork-point"
msgstr "--fork-point"
@@ -40778,7 +40778,7 @@ msgstr ""
#. type: Title =
#: en/git-merge-file.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-merge-file(1)"
msgstr "git-merge-file(1)"
@@ -40882,7 +40882,7 @@ msgstr ""
#. type: Labeled list
#: en/git-merge-file.txt:70
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--diff3"
msgstr "--diff3"
@@ -40893,7 +40893,7 @@ msgstr ""
#. type: Labeled list
#: en/git-merge-file.txt:75
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--union"
msgstr "--union"
@@ -40932,7 +40932,7 @@ msgstr ""
#. type: Title =
#: en/git-merge-index.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-merge-index(1)"
msgstr "git-merge-index(1)"
@@ -41045,7 +41045,7 @@ msgstr ""
#. type: Title =
#: en/git-merge-one-file.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-merge-one-file(1)"
msgstr "git-merge-one-file(1)"
@@ -41164,7 +41164,7 @@ msgstr ""
#. type: Title =
#: en/git-mergetool.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-mergetool(1)"
msgstr "git-mergetool(1)"
@@ -41308,7 +41308,7 @@ msgstr ""
#. type: Title =
#: en/git-merge-tree.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-merge-tree(1)"
msgstr "git-merge-tree(1)"
@@ -41343,7 +41343,7 @@ msgstr ""
#. type: Title =
#: en/git-merge.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-merge(1)"
msgstr "git-merge(1)"
@@ -41476,7 +41476,7 @@ msgstr ""
#. type: Labeled list
#: en/git-merge.txt:89
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]rerere-autoupdate"
msgstr "--[no-]rerere-autoupdate"
@@ -41939,7 +41939,7 @@ msgstr ""
#. type: Title =
#: en/git-mktag.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-mktag(1)"
msgstr "git-mktag(1)"
@@ -42000,7 +42000,7 @@ msgstr ""
#. type: Title =
#: en/git-mktree.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-mktree(1)"
msgstr "git-mktree(1)"
@@ -42031,7 +42031,7 @@ msgstr ""
#. type: Labeled list
#: en/git-mktree.txt:26
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--missing"
msgstr "--missing"
@@ -42054,7 +42054,7 @@ msgstr ""
#. type: Title =
#: en/git-mv.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-mv(1)"
msgstr "git-mv(1)"
@@ -42152,7 +42152,7 @@ msgstr ""
#. type: Title =
#: en/git-name-rev.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-name-rev(1)"
msgstr "git-name-rev(1)"
@@ -42231,7 +42231,7 @@ msgstr ""
#. type: Labeled list
#: en/git-name-rev.txt:57
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-undefined"
msgstr "--no-undefined"
@@ -42284,7 +42284,7 @@ msgstr ""
#. type: Title =
#: en/git-notes.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-notes(1)"
msgstr "git-notes(1)"
@@ -42655,7 +42655,7 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:192 en/merge-options.txt:1
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--commit"
msgstr "--commit"
@@ -42920,7 +42920,7 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:375
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_NOTES_REF`"
msgstr "`GIT_NOTES_REF`"
@@ -42933,7 +42933,7 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:379
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_NOTES_DISPLAY_REF`"
msgstr "`GIT_NOTES_DISPLAY_REF`"
@@ -42954,7 +42954,7 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:389
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_NOTES_REWRITE_MODE`"
msgstr "`GIT_NOTES_REWRITE_MODE`"
@@ -42968,7 +42968,7 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:395
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_NOTES_REWRITE_REF`"
msgstr "`GIT_NOTES_REWRITE_REF`"
@@ -42988,7 +42988,7 @@ msgstr ""
#. type: Title =
#: en/git-p4.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4(1)"
msgstr "git-p4(1)"
@@ -43338,7 +43338,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:199
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--detect-branches"
msgstr "--detect-branches"
@@ -43365,7 +43365,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:208
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--silent"
msgstr "--silent"
@@ -43376,7 +43376,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:211
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--detect-labels"
msgstr "--detect-labels"
@@ -43390,7 +43390,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:216 en/git-p4.txt:331
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--import-labels"
msgstr "--import-labels"
@@ -43401,7 +43401,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:219
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--import-local"
msgstr "--import-local"
@@ -43449,7 +43449,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:243
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--keep-path"
msgstr "--keep-path"
@@ -43465,7 +43465,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:251
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--use-client-spec"
msgstr "--use-client-spec"
@@ -43552,7 +43552,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:286
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--preserve-user"
msgstr "--preserve-user"
@@ -43565,7 +43565,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:290
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--export-labels"
msgstr "--export-labels"
@@ -43585,7 +43585,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:299
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--prepare-p4-only"
msgstr "--prepare-p4-only"
@@ -43601,7 +43601,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:306
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--shelve"
msgstr "--shelve"
@@ -43910,7 +43910,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:456
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.user"
msgstr "git-p4.user"
@@ -43923,7 +43923,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:460
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.password"
msgstr "git-p4.password"
@@ -43936,7 +43936,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:465
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.port"
msgstr "git-p4.port"
@@ -43949,7 +43949,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:470
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.host"
msgstr "git-p4.host"
@@ -43962,7 +43962,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:475
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.client"
msgstr "git-p4.client"
@@ -43975,7 +43975,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:479
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.retries"
msgstr "git-p4.retries"
@@ -43995,7 +43995,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:487
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.syncFromOrigin"
msgstr "git-p4.syncFromOrigin"
@@ -44011,7 +44011,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:494
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.branchUser"
msgstr "git-p4.branchUser"
@@ -44025,7 +44025,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:500
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.branchList"
msgstr "git-p4.branchList"
@@ -44060,7 +44060,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:515
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.importLabels"
msgstr "git-p4.importLabels"
@@ -44071,7 +44071,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:518
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.labelImportRegexp"
msgstr "git-p4.labelImportRegexp"
@@ -44084,7 +44084,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:522
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.useClientSpec"
msgstr "git-p4.useClientSpec"
@@ -44099,7 +44099,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:528
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.pathEncoding"
msgstr "git-p4.pathEncoding"
@@ -44115,7 +44115,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:535
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.largeFileSystem"
msgstr "git-p4.largeFileSystem"
@@ -44137,7 +44137,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:546
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.largeFileExtensions"
msgstr "git-p4.largeFileExtensions"
@@ -44150,7 +44150,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:550
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.largeFileThreshold"
msgstr "git-p4.largeFileThreshold"
@@ -44164,7 +44164,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:555
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.largeFileCompressedThreshold"
msgstr "git-p4.largeFileCompressedThreshold"
@@ -44179,7 +44179,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:561
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.largeFilePush"
msgstr "git-p4.largeFilePush"
@@ -44192,7 +44192,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:565
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.keepEmptyCommits"
msgstr "git-p4.keepEmptyCommits"
@@ -44205,7 +44205,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:569
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.mapUser"
msgstr "git-p4.mapUser"
@@ -44237,7 +44237,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:582
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.detectRenames"
msgstr "git-p4.detectRenames"
@@ -44250,7 +44250,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:586
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.detectCopies"
msgstr "git-p4.detectCopies"
@@ -44263,7 +44263,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:590
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.detectCopiesHarder"
msgstr "git-p4.detectCopiesHarder"
@@ -44274,7 +44274,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:593
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.preserveUser"
msgstr "git-p4.preserveUser"
@@ -44300,7 +44300,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:602
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.skipSubmitEdit"
msgstr "git-p4.skipSubmitEdit"
@@ -44313,7 +44313,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:607
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.skipSubmitEditCheck"
msgstr "git-p4.skipSubmitEditCheck"
@@ -44327,7 +44327,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:612
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.allowSubmit"
msgstr "git-p4.allowSubmit"
@@ -44343,7 +44343,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:619
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.skipUserNameCheck"
msgstr "git-p4.skipUserNameCheck"
@@ -44356,7 +44356,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:624
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.attemptRCSCleanup"
msgstr "git-p4.attemptRCSCleanup"
@@ -44370,7 +44370,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:630
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.exportLabels"
msgstr "git-p4.exportLabels"
@@ -44381,7 +44381,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:633
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.labelExportRegexp"
msgstr "git-p4.labelExportRegexp"
@@ -44394,7 +44394,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:637
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-p4.conflict"
msgstr "git-p4.conflict"
@@ -44441,7 +44441,7 @@ msgstr ""
#. type: Title =
#: en/git-pack-objects.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-pack-objects(1)"
msgstr "git-pack-objects(1)"
@@ -44528,7 +44528,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:61
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--revs"
msgstr "--revs"
@@ -44544,7 +44544,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:70 en/rev-list-options.txt:693
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--unpacked"
msgstr "--unpacked"
@@ -44622,7 +44622,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:118
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--honor-pack-keep"
msgstr "--honor-pack-keep"
@@ -44649,7 +44649,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:132
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--non-empty"
msgstr "--non-empty"
@@ -44660,7 +44660,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:142
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--all-progress"
msgstr "--all-progress"
@@ -44678,7 +44678,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:153
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--all-progress-implied"
msgstr "--all-progress-implied"
@@ -44699,7 +44699,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:162
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-reuse-delta"
msgstr "--no-reuse-delta"
@@ -44714,7 +44714,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:169
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-reuse-object"
msgstr "--no-reuse-object"
@@ -44762,7 +44762,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:194
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--shallow"
msgstr "--shallow"
@@ -44776,7 +44776,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:199
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--delta-base-offset"
msgstr "--delta-base-offset"
@@ -44815,7 +44815,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:230
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--keep-true-parents"
msgstr "--keep-true-parents"
@@ -44835,7 +44835,7 @@ msgstr ""
#. type: Title =
#: en/git-pack-redundant.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-pack-redundant(1)"
msgstr "git-pack-redundant(1)"
@@ -44883,7 +44883,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-redundant.txt:35
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--alt-odb"
msgstr "--alt-odb"
@@ -44911,7 +44911,7 @@ msgstr ""
#. type: Title =
#: en/git-pack-refs.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-pack-refs(1)"
msgstr "git-pack-refs(1)"
@@ -44991,7 +44991,7 @@ msgstr ""
#. type: Title =
#: en/git-parse-remote.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-parse-remote(1)"
msgstr "git-parse-remote(1)"
@@ -45018,7 +45018,7 @@ msgstr ""
#. type: Title =
#: en/git-patch-id.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-patch-id(1)"
msgstr "git-patch-id(1)"
@@ -45065,7 +45065,7 @@ msgstr ""
#. type: Labeled list
#: en/git-patch-id.txt:33
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--stable"
msgstr "--stable"
@@ -45102,7 +45102,7 @@ msgstr ""
#. type: Labeled list
#: en/git-patch-id.txt:50
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--unstable"
msgstr "--unstable"
@@ -45128,7 +45128,7 @@ msgstr ""
#. type: Title =
#: en/git-prune-packed.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-prune-packed(1)"
msgstr "git-prune-packed(1)"
@@ -45190,7 +45190,7 @@ msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
#. type: Title =
#: en/git-prune.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-prune(1)"
msgstr "git-prune(1)"
@@ -45300,7 +45300,7 @@ msgstr "linkgit:git-fsck[1], linkgit:git-gc[1], linkgit:git-reflog[1]"
#. type: Title =
#: en/git-pull.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-pull(1)"
msgstr "git-pull(1)"
@@ -45492,7 +45492,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pull.txt:128 en/git-svn.txt:245
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-rebase"
msgstr "--no-rebase"
@@ -45503,13 +45503,13 @@ msgstr ""
#. type: Labeled list
#: en/git-pull.txt:131 en/git-rebase.txt:442
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--autostash"
msgstr "--autostash"
#. type: Labeled list
#: en/git-pull.txt:132 en/git-rebase.txt:443
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-autostash"
msgstr "--no-autostash"
@@ -45687,7 +45687,7 @@ msgstr "linkgit:git-fetch[1], linkgit:git-merge[1], linkgit:git-config[1]"
#. type: Title =
#: en/git-push.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-push(1)"
msgstr "git-push(1)"
@@ -45888,7 +45888,7 @@ msgstr ""
#. type: Labeled list
#: en/git-push.txt:135
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--follow-tags"
msgstr "--follow-tags"
@@ -45904,7 +45904,7 @@ msgstr ""
#. type: Labeled list
#: en/git-push.txt:143 en/git-send-pack.txt:73
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]signed"
msgstr "--[no-]signed"
@@ -45928,7 +45928,7 @@ msgstr ""
#. type: Labeled list
#: en/git-push.txt:154
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]atomic"
msgstr "--[no-]atomic"
@@ -45942,7 +45942,7 @@ msgstr ""
#. type: Labeled list
#: en/git-push.txt:160
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--push-option"
msgstr "--push-option"
@@ -45976,7 +45976,7 @@ msgstr ""
#. type: Labeled list
#: en/git-push.txt:172
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]force-with-lease"
msgstr "--[no-]force-with-lease"
@@ -46124,7 +46124,7 @@ msgstr ""
#. type: Labeled list
#: en/git-push.txt:252
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]thin"
msgstr "--[no-]thin"
@@ -46168,7 +46168,7 @@ msgstr ""
#. type: Labeled list
#: en/git-push.txt:290
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]verify"
msgstr "--[no-]verify"
@@ -46675,7 +46675,7 @@ msgstr ""
#. type: Title =
#: en/git-quiltimport.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-quiltimport(1)"
msgstr "git-quiltimport(1)"
@@ -46776,7 +46776,7 @@ msgstr ""
#. type: Title =
#: en/git-read-tree.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-read-tree(1)"
msgstr "git-read-tree(1)"
@@ -46829,7 +46829,7 @@ msgstr ""
#. type: Labeled list
#: en/git-read-tree.txt:40
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--reset"
msgstr "--reset"
@@ -46870,7 +46870,7 @@ msgstr ""
#. type: Labeled list
#: en/git-read-tree.txt:65
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--trivial"
msgstr "--trivial"
@@ -46959,7 +46959,7 @@ msgstr ""
#. type: Labeled list
#: en/git-read-tree.txt:118
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-sparse-checkout"
msgstr "--no-sparse-checkout"
@@ -46970,7 +46970,7 @@ msgstr ""
#. type: Labeled list
#: en/git-read-tree.txt:122
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--empty"
msgstr "--empty"
@@ -47513,7 +47513,7 @@ msgstr ""
#. type: Title =
#: en/git-rebase.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-rebase(1)"
msgstr "git-rebase(1)"
@@ -47924,7 +47924,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rebase.txt:255 en/sequencer.txt:6
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--quit"
msgstr "--quit"
@@ -47937,7 +47937,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rebase.txt:260
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--keep-empty"
msgstr "--keep-empty"
@@ -47954,7 +47954,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rebase.txt:267
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--edit-todo"
msgstr "--edit-todo"
@@ -48047,7 +48047,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rebase.txt:325 en/git-rev-parse.txt:98 en/git-show-ref.txt:59
#: en/git-tag.txt:80
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--verify"
msgstr "--verify"
@@ -48060,7 +48060,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rebase.txt:336
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--force-rebase"
msgstr "--force-rebase"
@@ -48083,7 +48083,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rebase.txt:347
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-fork-point"
msgstr "--no-fork-point"
@@ -48144,7 +48144,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rebase.txt:384 en/git-svn.txt:642
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--preserve-merges"
msgstr "--preserve-merges"
@@ -48235,13 +48235,13 @@ msgstr ""
#. type: Labeled list
#: en/git-rebase.txt:425
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--autosquash"
msgstr "--autosquash"
#. type: Labeled list
#: en/git-rebase.txt:426
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-autosquash"
msgstr "--no-autosquash"
@@ -48281,7 +48281,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rebase.txt:450 en/merge-options.txt:35
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-ff"
msgstr "--no-ff"
@@ -48953,7 +48953,7 @@ msgstr ""
#. type: Title =
#: en/git-receive-pack.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-receive-pack(1)"
msgstr "git-receive-pack(1)"
@@ -49063,7 +49063,7 @@ msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:66
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_PUSH_CERT_SIGNER`"
msgstr "`GIT_PUSH_CERT_SIGNER`"
@@ -49076,7 +49076,7 @@ msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:70
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_PUSH_CERT_KEY`"
msgstr "`GIT_PUSH_CERT_KEY`"
@@ -49087,7 +49087,7 @@ msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:73
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_PUSH_CERT_STATUS`"
msgstr "`GIT_PUSH_CERT_STATUS`"
@@ -49101,7 +49101,7 @@ msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:78
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_PUSH_CERT_NONCE`"
msgstr "`GIT_PUSH_CERT_NONCE`"
@@ -49116,13 +49116,13 @@ msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:85
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_PUSH_CERT_NONCE_STATUS`"
msgstr "`GIT_PUSH_CERT_NONCE_STATUS`"
#. type: Labeled list
#: en/git-receive-pack.txt:86
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`UNSOLICITED`"
msgstr "`UNSOLICITED`"
@@ -49133,7 +49133,7 @@ msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:89
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`MISSING`"
msgstr "`MISSING`"
@@ -49144,7 +49144,7 @@ msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:91
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`BAD`"
msgstr "`BAD`"
@@ -49155,7 +49155,7 @@ msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:93
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`OK`"
msgstr "`OK`"
@@ -49166,7 +49166,7 @@ msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:95
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`SLOP`"
msgstr "`SLOP`"
@@ -49180,7 +49180,7 @@ msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:100
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_PUSH_CERT_NONCE_SLOP`"
msgstr "`GIT_PUSH_CERT_NONCE_SLOP`"
@@ -49388,7 +49388,7 @@ msgstr "linkgit:git-send-pack[1], linkgit:gitnamespaces[7]"
#. type: Title =
#: en/git-reflog.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-reflog(1)"
msgstr "git-reflog(1)"
@@ -49525,7 +49525,7 @@ msgstr ""
#. type: Labeled list
#: en/git-reflog.txt:93
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--updateref"
msgstr "--updateref"
@@ -49539,7 +49539,7 @@ msgstr ""
#. type: Labeled list
#: en/git-reflog.txt:98
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--rewrite"
msgstr "--rewrite"
@@ -49552,7 +49552,7 @@ msgstr ""
#. type: Labeled list
#: en/git-reflog.txt:103
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--stale-fix"
msgstr "--stale-fix"
@@ -49600,7 +49600,7 @@ msgstr ""
#. type: Title =
#: en/git-remote-ext.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-remote-ext(1)"
msgstr "git-remote-ext(1)"
@@ -49732,7 +49732,7 @@ msgstr ""
#. type: Labeled list
#: en/git-remote-ext.txt:61 en/git-remote-fd.txt:33
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "GIT_TRANSLOOP_DEBUG"
msgstr "GIT_TRANSLOOP_DEBUG"
@@ -49749,7 +49749,7 @@ msgstr ""
#. type: Labeled list
#: en/git-remote-ext.txt:67
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "GIT_EXT_SERVICE"
msgstr "GIT_EXT_SERVICE"
@@ -49762,7 +49762,7 @@ msgstr ""
#. type: Labeled list
#: en/git-remote-ext.txt:71
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "GIT_EXT_SERVICE_NOPREFIX"
msgstr "GIT_EXT_SERVICE_NOPREFIX"
@@ -49880,7 +49880,7 @@ msgstr "linkgit:gitremote-helpers[1]"
#. type: Title =
#: en/git-remote-fd.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-remote-fd(1)"
msgstr "git-remote-fd(1)"
@@ -49972,7 +49972,7 @@ msgstr ""
#. type: Title =
#: en/git-remote-testgit.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-remote-testgit(1)"
msgstr "git-remote-testgit(1)"
@@ -50004,7 +50004,7 @@ msgstr ""
#. type: Title =
#: en/git-remote.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-remote(1)"
msgstr "git-remote(1)"
@@ -50431,7 +50431,7 @@ msgstr "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
#. type: Title =
#: en/git-repack.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-repack(1)"
msgstr "git-repack(1)"
@@ -50559,7 +50559,7 @@ msgstr ""
#. type: Labeled list
#: en/git-repack.txt:117
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--write-bitmap-index"
msgstr "--write-bitmap-index"
@@ -50575,7 +50575,7 @@ msgstr ""
#. type: Labeled list
#: en/git-repack.txt:124
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--pack-kept-objects"
msgstr "--pack-kept-objects"
@@ -50606,7 +50606,7 @@ msgstr ""
#. type: Labeled list
#: en/git-repack.txt:140
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--keep-unreachable"
msgstr "--keep-unreachable"
@@ -50640,7 +50640,7 @@ msgstr "linkgit:git-pack-objects[1] linkgit:git-prune-packed[1]"
#. type: Title =
#: en/git-replace.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-replace(1)"
msgstr "git-replace(1)"
@@ -50920,7 +50920,7 @@ msgstr ""
#. type: Title =
#: en/git-request-pull.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-request-pull(1)"
msgstr "git-request-pull(1)"
@@ -51062,7 +51062,7 @@ msgstr ""
#. type: Title =
#: en/git-rerere.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-rerere(1)"
msgstr "git-rerere(1)"
@@ -51416,7 +51416,7 @@ msgstr ""
#. type: Title =
#: en/git-reset.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-reset(1)"
msgstr "git-reset(1)"
@@ -51511,7 +51511,7 @@ msgstr ""
#. type: Labeled list
#: en/git-reset.txt:53
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--soft"
msgstr "--soft"
@@ -51525,7 +51525,7 @@ msgstr ""
#. type: Labeled list
#: en/git-reset.txt:59
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--mixed"
msgstr "--mixed"
@@ -51546,7 +51546,7 @@ msgstr ""
#. type: Labeled list
#: en/git-reset.txt:67
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--hard"
msgstr "--hard"
@@ -52243,7 +52243,7 @@ msgstr ""
#. type: Title =
#: en/git-revert.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-revert(1)"
msgstr "git-revert(1)"
@@ -52380,7 +52380,7 @@ msgstr ""
#. type: Title =
#: en/git-rev-list.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-rev-list(1)"
msgstr "git-rev-list(1)"
@@ -52526,7 +52526,7 @@ msgstr ""
#. type: Title =
#: en/git-rev-parse.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-rev-parse(1)"
msgstr "git-rev-parse(1)"
@@ -52564,7 +52564,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:33
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--parseopt"
msgstr "--parseopt"
@@ -52576,7 +52576,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:36
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--sq-quote"
msgstr "--sq-quote"
@@ -52596,7 +52596,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:44
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--keep-dashdash"
msgstr "--keep-dashdash"
@@ -52609,7 +52609,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:48
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--stop-at-non-option"
msgstr "--stop-at-non-option"
@@ -52623,7 +52623,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:53
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--stuck-long"
msgstr "--stuck-long"
@@ -52642,7 +52642,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:60
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--revs-only"
msgstr "--revs-only"
@@ -52654,7 +52654,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:64
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-revs"
msgstr "--no-revs"
@@ -52665,7 +52665,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:68
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--flags"
msgstr "--flags"
@@ -52676,7 +52676,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:71
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-flags"
msgstr "--no-flags"
@@ -52764,7 +52764,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:120
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--sq"
msgstr "--sq"
@@ -52814,7 +52814,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:145
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--symbolic"
msgstr "--symbolic"
@@ -52828,7 +52828,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:150
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--symbolic-full-name"
msgstr "--symbolic-full-name"
@@ -52949,7 +52949,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:205
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--local-env-vars"
msgstr "--local-env-vars"
@@ -52963,7 +52963,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:211
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--git-dir"
msgstr "--git-dir"
@@ -52984,7 +52984,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:220
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--absolute-git-dir"
msgstr "--absolute-git-dir"
@@ -52996,7 +52996,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:224
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--git-common-dir"
msgstr "--git-common-dir"
@@ -53007,7 +53007,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:227
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--is-inside-git-dir"
msgstr "--is-inside-git-dir"
@@ -53020,7 +53020,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:231
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--is-inside-work-tree"
msgstr "--is-inside-work-tree"
@@ -53033,7 +53033,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:235
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--is-bare-repository"
msgstr "--is-bare-repository"
@@ -53073,7 +53073,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:251
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--show-cdup"
msgstr "--show-cdup"
@@ -53087,7 +53087,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:256
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--show-prefix"
msgstr "--show-prefix"
@@ -53100,7 +53100,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:261
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--show-toplevel"
msgstr "--show-toplevel"
@@ -53122,7 +53122,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:270
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--shared-index-path"
msgstr "--shared-index-path"
@@ -53501,7 +53501,7 @@ msgstr ""
#. type: Title =
#: en/git-rm.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-rm(1)"
msgstr "git-rm(1)"
@@ -53569,7 +53569,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rm.txt:63
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--ignore-unmatch"
msgstr "--ignore-unmatch"
@@ -53781,7 +53781,7 @@ msgstr ""
#. type: Title =
#: en/git-send-email.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-send-email(1)"
msgstr "git-send-email(1)"
@@ -53854,7 +53854,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:48 en/git-tag.txt:60
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--annotate"
msgstr "--annotate"
@@ -53899,7 +53899,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:65
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--compose"
msgstr "--compose"
@@ -54073,13 +54073,13 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:145
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--xmailer"
msgstr "--xmailer"
#. type: Labeled list
#: en/git-send-email.txt:146
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-xmailer"
msgstr "--no-xmailer"
@@ -54253,7 +54253,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:227
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--smtp-ssl"
msgstr "--smtp-ssl"
@@ -54264,7 +54264,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:230
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--smtp-ssl-cert-path"
msgstr "--smtp-ssl-cert-path"
@@ -54347,7 +54347,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:266
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]chain-reply-to"
msgstr "--[no-]chain-reply-to"
@@ -54370,7 +54370,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:280
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]signed-off-by-cc"
msgstr "--[no-]signed-off-by-cc"
@@ -54384,7 +54384,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:285
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]cc-cover"
msgstr "--[no-]cc-cover"
@@ -54399,7 +54399,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:291
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]to-cover"
msgstr "--[no-]to-cover"
@@ -54484,7 +54484,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:319
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]suppress-from"
msgstr "--[no-]suppress-from"
@@ -54498,7 +54498,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:324
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]thread"
msgstr "--[no-]thread"
@@ -54590,7 +54590,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:365
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]format-patch"
msgstr "--[no-]format-patch"
@@ -54612,7 +54612,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:375
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]validate"
msgstr "--[no-]validate"
@@ -54655,7 +54655,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:394
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--dump-aliases"
msgstr "--dump-aliases"
@@ -54826,7 +54826,7 @@ msgstr ""
#. type: Title =
#: en/git-send-pack.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-send-pack(1)"
msgstr "git-send-pack(1)"
@@ -54880,7 +54880,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-pack.txt:68
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--atomic"
msgstr "--atomic"
@@ -54957,7 +54957,7 @@ msgstr ""
#. type: Title =
#: en/git-shell.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-shell(1)"
msgstr "git-shell(1)"
@@ -55146,7 +55146,7 @@ msgstr ""
#. type: Title =
#: en/git-sh-i18n.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-sh-i18n(1)"
msgstr "git-sh-i18n(1)"
@@ -55202,7 +55202,7 @@ msgstr ""
#. type: Title =
#: en/git-shortlog.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-shortlog(1)"
msgstr "git-shortlog(1)"
@@ -55254,7 +55254,7 @@ msgstr ""
#. type: Labeled list
#: en/git-shortlog.txt:39
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--email"
msgstr "--email"
@@ -55285,7 +55285,7 @@ msgstr ""
#. type: Labeled list
#: en/git-shortlog.txt:51
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--committer"
msgstr "--committer"
@@ -55351,7 +55351,7 @@ msgstr ""
#. type: Title =
#: en/git-show-branch.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-show-branch(1)"
msgstr "git-show-branch(1)"
@@ -55430,7 +55430,7 @@ msgstr ""
#. type: Labeled list
#: en/git-show-branch.txt:51
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--current"
msgstr "--current"
@@ -55443,7 +55443,7 @@ msgstr ""
#. type: Labeled list
#: en/git-show-branch.txt:56 en/rev-list-options.txt:635
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--topo-order"
msgstr "--topo-order"
@@ -55457,7 +55457,7 @@ msgstr ""
#. type: Labeled list
#: en/git-show-branch.txt:62 en/rev-list-options.txt:627
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--date-order"
msgstr "--date-order"
@@ -55472,7 +55472,7 @@ msgstr ""
#. type: Labeled list
#: en/git-show-branch.txt:67 en/rev-list-options.txt:333
#: en/rev-list-options.txt:466
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--sparse"
msgstr "--sparse"
@@ -55505,7 +55505,7 @@ msgstr ""
#. type: Labeled list
#: en/git-show-branch.txt:83
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--merge-base"
msgstr "--merge-base"
@@ -55527,7 +55527,7 @@ msgstr ""
#. type: Labeled list
#: en/git-show-branch.txt:94
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-name"
msgstr "--no-name"
@@ -55538,7 +55538,7 @@ msgstr ""
#. type: Labeled list
#: en/git-show-branch.txt:97
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--sha1-name"
msgstr "--sha1-name"
@@ -55552,7 +55552,7 @@ msgstr ""
#. type: Labeled list
#: en/git-show-branch.txt:103
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--topics"
msgstr "--topics"
@@ -55706,7 +55706,7 @@ msgstr ""
#. type: Title =
#: en/git-show-index.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-show-index(1)"
msgstr "git-show-index(1)"
@@ -55738,7 +55738,7 @@ msgstr ""
#. type: Title =
#: en/git-show-ref.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-show-ref(1)"
msgstr "git-show-ref(1)"
@@ -55788,7 +55788,7 @@ msgstr ""
#. type: Labeled list
#: en/git-show-ref.txt:36
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--head"
msgstr "--head"
@@ -55807,7 +55807,7 @@ msgstr ""
#. type: Labeled list
#: en/git-show-ref.txt:48
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--dereference"
msgstr "--dereference"
@@ -56050,7 +56050,7 @@ msgstr ""
#. type: Title =
#: en/git-show.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-show(1)"
msgstr "git-show(1)"
@@ -56181,7 +56181,7 @@ msgstr ""
#. type: Title =
#: en/git-sh-setup.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-sh-setup(1)"
msgstr "git-sh-setup(1)"
@@ -56372,7 +56372,7 @@ msgstr ""
#. type: Title =
#: en/git-stage.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-stage(1)"
msgstr "git-stage(1)"
@@ -56396,7 +56396,7 @@ msgstr ""
#. type: Title =
#: en/git-stash.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-stash(1)"
msgstr "git-stash(1)"
@@ -56884,7 +56884,7 @@ msgstr ""
#. type: Title =
#: en/git-status.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-status(1)"
msgstr "git-status(1)"
@@ -57452,7 +57452,7 @@ msgstr ""
#. type: Title =
#: en/git-stripspace.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-stripspace(1)"
msgstr "git-stripspace(1)"
@@ -57519,7 +57519,7 @@ msgstr ""
#. type: Labeled list
#: en/git-stripspace.txt:39
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--strip-comments"
msgstr "--strip-comments"
@@ -57531,7 +57531,7 @@ msgstr ""
#. type: Labeled list
#: en/git-stripspace.txt:43
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--comment-lines"
msgstr "--comment-lines"
@@ -57604,7 +57604,7 @@ msgstr ""
#. type: Title =
#: en/git-submodule.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-submodule(1)"
msgstr "git-submodule(1)"
@@ -58147,7 +58147,7 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:305
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--files"
msgstr "--files"
@@ -58161,7 +58161,7 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:311
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--summary-limit"
msgstr "--summary-limit"
@@ -58177,7 +58177,7 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:318
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--remote"
msgstr "--remote"
@@ -58228,7 +58228,7 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:350
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-fetch"
msgstr "--no-fetch"
@@ -58241,7 +58241,7 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:354
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--checkout"
msgstr "--checkout"
@@ -58270,7 +58270,7 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:373
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--rebase"
msgstr "--rebase"
@@ -58287,7 +58287,7 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:382
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--init"
msgstr "--init"
@@ -58301,7 +58301,7 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:387
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--name"
msgstr "--name"
@@ -58346,7 +58346,7 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:406
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--depth"
msgstr "--depth"
@@ -58360,7 +58360,7 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:411
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]recommend-shallow"
msgstr "--[no-]recommend-shallow"
@@ -58400,7 +58400,7 @@ msgstr ""
#. type: Title =
#: en/git-svn.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-svn(1)"
msgstr "git-svn(1)"
@@ -58495,7 +58495,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:47
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--stdlayout"
msgstr "--stdlayout"
@@ -58514,7 +58514,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:58
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-metadata"
msgstr "--no-metadata"
@@ -58528,7 +58528,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:62
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--use-svm-props"
msgstr "--use-svm-props"
@@ -58539,7 +58539,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:64
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--use-svnsync-props"
msgstr "--use-svnsync-props"
@@ -58644,7 +58644,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:106
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-minimize-url"
msgstr "--no-minimize-url"
@@ -58684,7 +58684,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:127
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--localtime"
msgstr "--localtime"
@@ -58707,7 +58707,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:138 en/git-svn.txt:505
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--parent"
msgstr "--parent"
@@ -58814,7 +58814,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:199
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--preserve-empty-dirs"
msgstr "--preserve-empty-dirs"
@@ -59015,7 +59015,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:293
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--message"
msgstr "--message"
@@ -59026,7 +59026,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:297
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--tag"
msgstr "--tag"
@@ -59076,7 +59076,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:317
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--username"
msgstr "--username"
@@ -59089,7 +59089,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:321
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--commit-url"
msgstr "--commit-url"
@@ -59108,7 +59108,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:330 en/rev-list-options.txt:786
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--parents"
msgstr "--parents"
@@ -59198,7 +59198,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:364
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--show-commit"
msgstr "--show-commit"
@@ -59209,7 +59209,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:366 en/pretty-options.txt:31
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--oneline"
msgstr "--oneline"
@@ -59249,7 +59249,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:384
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--git-format"
msgstr "--git-format"
@@ -59285,7 +59285,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:397
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--before"
msgstr "--before"
@@ -59299,7 +59299,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:403
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--after"
msgstr "--after"
@@ -59653,7 +59653,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:571
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--rmdir"
msgstr "--rmdir"
@@ -59821,7 +59821,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:663
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--use-log-author"
msgstr "--use-log-author"
@@ -59841,7 +59841,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:671
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--add-author-from"
msgstr "--add-author-from"
@@ -59909,7 +59909,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:697
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--follow-parent"
msgstr "--follow-parent"
@@ -60630,7 +60630,7 @@ msgstr ""
#. type: Title =
#: en/git-symbolic-ref.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-symbolic-ref(1)"
msgstr "git-symbolic-ref(1)"
@@ -60725,7 +60725,7 @@ msgstr ""
#. type: Title =
#: en/git-tag.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-tag(1)"
msgstr "git-tag(1)"
@@ -60815,7 +60815,7 @@ msgstr ""
#. type: Labeled list
#: en/git-tag.txt:64
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--sign"
msgstr "--sign"
@@ -62093,7 +62093,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:579
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--html-path"
msgstr "--html-path"
@@ -62106,7 +62106,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:583
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--man-path"
msgstr "--man-path"
@@ -62119,7 +62119,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:587
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--info-path"
msgstr "--info-path"
@@ -62132,7 +62132,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:592
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--paginate"
msgstr "--paginate"
@@ -62146,7 +62146,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:598
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-pager"
msgstr "--no-pager"
@@ -62221,7 +62221,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:629
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-replace-objects"
msgstr "--no-replace-objects"
@@ -62234,7 +62234,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:633
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--literal-pathspecs"
msgstr "--literal-pathspecs"
@@ -62248,7 +62248,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:638
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--glob-pathspecs"
msgstr "--glob-pathspecs"
@@ -62262,7 +62262,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:644
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--noglob-pathspecs"
msgstr "--noglob-pathspecs"
@@ -62276,7 +62276,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:650
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--icase-pathspecs"
msgstr "--icase-pathspecs"
@@ -62642,7 +62642,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:858
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_INDEX_FILE`"
msgstr "`GIT_INDEX_FILE`"
@@ -62655,7 +62655,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:863
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_INDEX_VERSION`"
msgstr "`GIT_INDEX_VERSION`"
@@ -62670,7 +62670,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:869
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_OBJECT_DIRECTORY`"
msgstr "`GIT_OBJECT_DIRECTORY`"
@@ -62684,7 +62684,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:875
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_ALTERNATE_OBJECT_DIRECTORIES`"
msgstr "`GIT_ALTERNATE_OBJECT_DIRECTORIES`"
@@ -62709,7 +62709,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:888
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_DIR`"
msgstr "`GIT_DIR`"
@@ -62723,7 +62723,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:894
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_WORK_TREE`"
msgstr "`GIT_WORK_TREE`"
@@ -62737,7 +62737,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:899
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_NAMESPACE`"
msgstr "`GIT_NAMESPACE`"
@@ -62750,7 +62750,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:903
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_CEILING_DIRECTORIES`"
msgstr "`GIT_CEILING_DIRECTORIES`"
@@ -62771,7 +62771,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:918
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_DISCOVERY_ACROSS_FILESYSTEM`"
msgstr "`GIT_DISCOVERY_ACROSS_FILESYSTEM`"
@@ -62789,7 +62789,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:928
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_COMMON_DIR`"
msgstr "`GIT_COMMON_DIR`"
@@ -62812,37 +62812,37 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:939
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_AUTHOR_NAME`"
msgstr "`GIT_AUTHOR_NAME`"
#. type: Labeled list
#: en/git.txt:940
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_AUTHOR_EMAIL`"
msgstr "`GIT_AUTHOR_EMAIL`"
#. type: Labeled list
#: en/git.txt:941
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_AUTHOR_DATE`"
msgstr "`GIT_AUTHOR_DATE`"
#. type: Labeled list
#: en/git.txt:942
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_COMMITTER_NAME`"
msgstr "`GIT_COMMITTER_NAME`"
#. type: Labeled list
#: en/git.txt:943
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_COMMITTER_EMAIL`"
msgstr "`GIT_COMMITTER_EMAIL`"
#. type: Labeled list
#: en/git.txt:944
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_COMMITTER_DATE`"
msgstr "`GIT_COMMITTER_DATE`"
@@ -62865,7 +62865,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:950
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_DIFF_OPTS`"
msgstr "`GIT_DIFF_OPTS`"
@@ -62880,7 +62880,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:956
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_EXTERNAL_DIFF`"
msgstr "`GIT_EXTERNAL_DIFF`"
@@ -62968,7 +62968,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:983
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_DIFF_PATH_COUNTER`"
msgstr "`GIT_DIFF_PATH_COUNTER`"
@@ -62979,7 +62979,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:986
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_DIFF_PATH_TOTAL`"
msgstr "`GIT_DIFF_PATH_TOTAL`"
@@ -62990,7 +62990,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:991
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_MERGE_VERBOSITY`"
msgstr "`GIT_MERGE_VERBOSITY`"
@@ -63003,7 +63003,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:996
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_PAGER`"
msgstr "`GIT_PAGER`"
@@ -63017,7 +63017,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1002
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_EDITOR`"
msgstr "`GIT_EDITOR`"
@@ -63032,13 +63032,13 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1008
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_SSH`"
msgstr "`GIT_SSH`"
#. type: Labeled list
#: en/git.txt:1009
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_SSH_COMMAND`"
msgstr "`GIT_SSH_COMMAND`"
@@ -63073,7 +63073,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1029
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_SSH_VARIANT`"
msgstr "`GIT_SSH_VARIANT`"
@@ -63088,7 +63088,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1035
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_ASKPASS`"
msgstr "`GIT_ASKPASS`"
@@ -63104,7 +63104,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1042
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_TERMINAL_PROMPT`"
msgstr "`GIT_TERMINAL_PROMPT`"
@@ -63117,7 +63117,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1046
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_CONFIG_NOSYSTEM`"
msgstr "`GIT_CONFIG_NOSYSTEM`"
@@ -63134,7 +63134,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1054
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_FLUSH`"
msgstr "`GIT_FLUSH`"
@@ -63155,7 +63155,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1065
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_TRACE`"
msgstr "`GIT_TRACE`"
@@ -63198,7 +63198,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1086
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_TRACE_PACK_ACCESS`"
msgstr "`GIT_TRACE_PACK_ACCESS`"
@@ -63213,7 +63213,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1093
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_TRACE_PACKET`"
msgstr "`GIT_TRACE_PACKET`"
@@ -63229,7 +63229,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1100
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_TRACE_PACKFILE`"
msgstr "`GIT_TRACE_PACKFILE`"
@@ -63252,7 +63252,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1111
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_TRACE_PERFORMANCE`"
msgstr "`GIT_TRACE_PERFORMANCE`"
@@ -63265,7 +63265,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1116
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_TRACE_SETUP`"
msgstr "`GIT_TRACE_SETUP`"
@@ -63279,7 +63279,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1121
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_TRACE_SHALLOW`"
msgstr "`GIT_TRACE_SHALLOW`"
@@ -63292,7 +63292,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1126
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_TRACE_CURL`"
msgstr "`GIT_TRACE_CURL`"
@@ -63308,7 +63308,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1134
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_LITERAL_PATHSPECS`"
msgstr "`GIT_LITERAL_PATHSPECS`"
@@ -63325,7 +63325,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1143
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_GLOB_PATHSPECS`"
msgstr "`GIT_GLOB_PATHSPECS`"
@@ -63338,7 +63338,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1147
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_NOGLOB_PATHSPECS`"
msgstr "`GIT_NOGLOB_PATHSPECS`"
@@ -63351,7 +63351,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1151
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_ICASE_PATHSPECS`"
msgstr "`GIT_ICASE_PATHSPECS`"
@@ -63364,7 +63364,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1155
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_REFLOG_ACTION`"
msgstr "`GIT_REFLOG_ACTION`"
@@ -63382,7 +63382,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1165
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_REF_PARANOIA`"
msgstr "`GIT_REF_PARANOIA`"
@@ -63401,7 +63401,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1176
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_ALLOW_PROTOCOL`"
msgstr "`GIT_ALLOW_PROTOCOL`"
@@ -63418,7 +63418,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:1185
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "`GIT_PROTOCOL_FROM_USER`"
msgstr "`GIT_PROTOCOL_FROM_USER`"
@@ -63617,7 +63617,7 @@ msgstr ""
#. type: Title =
#: en/git-unpack-file.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-unpack-file(1)"
msgstr "git-unpack-file(1)"
@@ -63648,7 +63648,7 @@ msgstr ""
#. type: Title =
#: en/git-unpack-objects.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-unpack-objects(1)"
msgstr "git-unpack-objects(1)"
@@ -63717,7 +63717,7 @@ msgstr ""
#. type: Title =
#: en/git-update-index.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-update-index(1)"
msgstr "git-update-index(1)"
@@ -63778,7 +63778,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:47
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--remove"
msgstr "--remove"
@@ -63810,7 +63810,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:61
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--ignore-submodules"
msgstr "--ignore-submodules"
@@ -63864,7 +63864,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:80
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--index-info"
msgstr "--index-info"
@@ -63880,7 +63880,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:86
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]assume-unchanged"
msgstr "--[no-]assume-unchanged"
@@ -63907,7 +63907,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:104
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--really-refresh"
msgstr "--really-refresh"
@@ -63920,7 +63920,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:108
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]skip-worktree"
msgstr "--[no-]skip-worktree"
@@ -63935,7 +63935,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:115
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--again"
msgstr "--again"
@@ -63948,7 +63948,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:119
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--unresolve"
msgstr "--unresolve"
@@ -63961,7 +63961,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:123
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--info-only"
msgstr "--info-only"
@@ -63974,7 +63974,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:128
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--force-remove"
msgstr "--force-remove"
@@ -63987,7 +63987,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:132
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--replace"
msgstr "--replace"
@@ -64038,13 +64038,13 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:164
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--split-index"
msgstr "--split-index"
#. type: Labeled list
#: en/git-update-index.txt:165
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-split-index"
msgstr "--no-split-index"
@@ -64068,13 +64068,13 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:177
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--untracked-cache"
msgstr "--untracked-cache"
#. type: Labeled list
#: en/git-update-index.txt:178
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-untracked-cache"
msgstr "--no-untracked-cache"
@@ -64097,7 +64097,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:188
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--test-untracked-cache"
msgstr "--test-untracked-cache"
@@ -64114,7 +64114,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:198
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--force-untracked-cache"
msgstr "--force-untracked-cache"
@@ -64608,7 +64608,7 @@ msgstr "linkgit:git-config[1], linkgit:git-add[1], linkgit:git-ls-files[1]"
#. type: Title =
#: en/git-update-ref.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-update-ref(1)"
msgstr "git-update-ref(1)"
@@ -64897,7 +64897,7 @@ msgstr ""
#. type: Title =
#: en/git-update-server-info.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-update-server-info(1)"
msgstr "git-update-server-info(1)"
@@ -64946,7 +64946,7 @@ msgstr ""
#. type: Title =
#: en/git-upload-archive.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-upload-archive(1)"
msgstr "git-upload-archive(1)"
@@ -65040,7 +65040,7 @@ msgstr ""
#. type: Title =
#: en/git-upload-pack.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-upload-pack(1)"
msgstr "git-upload-pack(1)"
@@ -65075,7 +65075,7 @@ msgstr ""
#. type: Labeled list
#: en/git-upload-pack.txt:29
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]strict"
msgstr "--[no-]strict"
@@ -65091,7 +65091,7 @@ msgstr ""
#. type: Labeled list
#: en/git-upload-pack.txt:35
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--stateless-rpc"
msgstr "--stateless-rpc"
@@ -65105,7 +65105,7 @@ msgstr ""
#. type: Labeled list
#: en/git-upload-pack.txt:40
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--advertise-refs"
msgstr "--advertise-refs"
@@ -65130,7 +65130,7 @@ msgstr "linkgit:gitnamespaces[7]"
#. type: Title =
#: en/git-var.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-var(1)"
msgstr "git-var(1)"
@@ -65175,7 +65175,7 @@ msgstr ""
#. type: Labeled list
#: en/git-var.txt:34
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "GIT_AUTHOR_IDENT"
msgstr "GIT_AUTHOR_IDENT"
@@ -65186,7 +65186,7 @@ msgstr ""
#. type: Labeled list
#: en/git-var.txt:37
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "GIT_COMMITTER_IDENT"
msgstr "GIT_COMMITTER_IDENT"
@@ -65197,7 +65197,7 @@ msgstr ""
#. type: Labeled list
#: en/git-var.txt:40
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "GIT_EDITOR"
msgstr "GIT_EDITOR"
@@ -65221,7 +65221,7 @@ msgstr ""
#. type: Labeled list
#: en/git-var.txt:52
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "GIT_PAGER"
msgstr "GIT_PAGER"
@@ -65240,7 +65240,7 @@ msgstr "linkgit:git-commit-tree[1] linkgit:git-tag[1] linkgit:git-config[1]"
#. type: Title =
#: en/git-verify-commit.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-verify-commit(1)"
msgstr "git-verify-commit(1)"
@@ -65279,7 +65279,7 @@ msgstr ""
#. type: Title =
#: en/git-verify-pack.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-verify-pack(1)"
msgstr "git-verify-pack(1)"
@@ -65321,7 +65321,7 @@ msgstr ""
#. type: Labeled list
#: en/git-verify-pack.txt:32
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--stat-only"
msgstr "--stat-only"
@@ -65367,7 +65367,7 @@ msgstr ""
#. type: Title =
#: en/git-verify-tag.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-verify-tag(1)"
msgstr "git-verify-tag(1)"
@@ -65659,7 +65659,7 @@ msgstr ""
#. type: Title =
#: en/git-whatchanged.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-whatchanged(1)"
msgstr "git-whatchanged(1)"
@@ -65723,7 +65723,7 @@ msgstr ""
#. type: Title =
#: en/git-worktree.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-worktree(1)"
msgstr "git-worktree(1)"
@@ -65889,7 +65889,7 @@ msgstr ""
#. type: Labeled list
#: en/git-worktree.txt:104
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]checkout"
msgstr "--[no-]checkout"
@@ -66154,7 +66154,7 @@ msgstr ""
#. type: Title =
#: en/git-write-tree.txt:2
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "git-write-tree(1)"
msgstr "git-write-tree(1)"
@@ -66192,7 +66192,7 @@ msgstr ""
#. type: Labeled list
#: en/git-write-tree.txt:30
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--missing-ok"
msgstr "--missing-ok"
@@ -66525,7 +66525,7 @@ msgstr ""
#. type: Labeled list
#: en/merge-config.txt:1
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "merge.conflictStyle"
msgstr "merge.conflictStyle"
@@ -66542,7 +66542,7 @@ msgstr ""
#. type: Labeled list
#: en/merge-config.txt:9
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "merge.defaultToUpstream"
msgstr "merge.defaultToUpstream"
@@ -66560,7 +66560,7 @@ msgstr ""
#. type: Labeled list
#: en/merge-config.txt:19
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "merge.ff"
msgstr "merge.ff"
@@ -66578,7 +66578,7 @@ msgstr ""
#. type: Labeled list
#: en/merge-config.txt:31
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "merge.renameLimit"
msgstr "merge.renameLimit"
@@ -66591,7 +66591,7 @@ msgstr ""
#. type: Labeled list
#: en/merge-config.txt:36
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "merge.renormalize"
msgstr "merge.renormalize"
@@ -66609,7 +66609,7 @@ msgstr ""
#. type: Labeled list
#: en/merge-config.txt:46
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "merge.stat"
msgstr "merge.stat"
@@ -66622,7 +66622,7 @@ msgstr ""
#. type: Labeled list
#: en/merge-config.txt:50
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "merge.tool"
msgstr "merge.tool"
@@ -66637,7 +66637,7 @@ msgstr ""
#. type: Labeled list
#: en/merge-config.txt:58
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "merge.verbosity"
msgstr "merge.verbosity"
@@ -66749,7 +66749,7 @@ msgstr ""
#. type: Labeled list
#: en/merge-options.txt:40
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--ff-only"
msgstr "--ff-only"
@@ -66789,13 +66789,13 @@ msgstr ""
#. type: Labeled list
#: en/merge-options.txt:64
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--squash"
msgstr "--squash"
#. type: Labeled list
#: en/merge-options.txt:65
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-squash"
msgstr "--no-squash"
@@ -66839,13 +66839,13 @@ msgstr ""
#. type: Labeled list
#: en/merge-options.txt:90
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--verify-signatures"
msgstr "--verify-signatures"
#. type: Labeled list
#: en/merge-options.txt:91
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-verify-signatures"
msgstr "--no-verify-signatures"
@@ -66860,7 +66860,7 @@ msgstr ""
#. type: Labeled list
#: en/merge-options.txt:99
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-summary"
msgstr "--no-summary"
@@ -66886,7 +66886,7 @@ msgstr ""
#. type: Labeled list
#: en/merge-options.txt:121
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--allow-unrelated-histories"
msgstr "--allow-unrelated-histories"
@@ -67989,7 +67989,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-options.txt:17
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--abbrev-commit"
msgstr "--abbrev-commit"
@@ -68010,7 +68010,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-options.txt:26
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-abbrev-commit"
msgstr "--no-abbrev-commit"
@@ -68048,13 +68048,13 @@ msgstr ""
#. type: Labeled list
#: en/pretty-options.txt:46
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--expand-tabs"
msgstr "--expand-tabs"
#. type: Labeled list
#: en/pretty-options.txt:47
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-expand-tabs"
msgstr "--no-expand-tabs"
@@ -68118,7 +68118,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-options.txt:81
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-notes"
msgstr "--no-notes"
@@ -68139,7 +68139,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-options.txt:89
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--[no-]standard-notes"
msgstr "--[no-]standard-notes"
@@ -68152,7 +68152,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-options.txt:94
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--show-signature"
msgstr "--show-signature"
@@ -69166,7 +69166,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:71
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--invert-grep"
msgstr "--invert-grep"
@@ -69179,7 +69179,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:76
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--regexp-ignore-case"
msgstr "--regexp-ignore-case"
@@ -69220,7 +69220,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:98
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--remove-empty"
msgstr "--remove-empty"
@@ -69231,7 +69231,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:101
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--merges"
msgstr "--merges"
@@ -69243,7 +69243,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:104
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-merges"
msgstr "--no-merges"
@@ -69268,13 +69268,13 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:110
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-min-parents"
msgstr "--no-min-parents"
#. type: Labeled list
#: en/rev-list-options.txt:111
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--no-max-parents"
msgstr "--no-max-parents"
@@ -69382,7 +69382,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:178
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--reflog"
msgstr "--reflog"
@@ -69402,7 +69402,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:187 en/rev-list-options.txt:569
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--bisect"
msgstr "--bisect"
@@ -69433,7 +69433,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:209
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--cherry-mark"
msgstr "--cherry-mark"
@@ -69446,7 +69446,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:213
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--cherry-pick"
msgstr "--cherry-pick"
@@ -69471,13 +69471,13 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:226
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--left-only"
msgstr "--left-only"
#. type: Labeled list
#: en/rev-list-options.txt:227
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--right-only"
msgstr "--right-only"
@@ -69499,7 +69499,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:238
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--cherry"
msgstr "--cherry"
@@ -69514,7 +69514,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:246
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--walk-reflogs"
msgstr "--walk-reflogs"
@@ -69580,7 +69580,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:282
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--boundary"
msgstr "--boundary"
@@ -69592,7 +69592,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:287
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--use-bitmap-index"
msgstr "--use-bitmap-index"
@@ -69650,7 +69650,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:313
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--simplify-by-decoration"
msgstr "--simplify-by-decoration"
@@ -69685,7 +69685,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:326
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--full-history"
msgstr "--full-history"
@@ -69696,7 +69696,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:329 en/rev-list-options.txt:462
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--dense"
msgstr "--dense"
@@ -69713,7 +69713,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:336 en/rev-list-options.txt:473
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--simplify-merges"
msgstr "--simplify-merges"
@@ -69727,7 +69727,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:341 en/rev-list-options.txt:520
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--ancestry-path"
msgstr "--ancestry-path"
@@ -70178,7 +70178,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:593
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--bisect-vars"
msgstr "--bisect-vars"
@@ -70198,7 +70198,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:605
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--bisect-all"
msgstr "--bisect-all"
@@ -70247,7 +70247,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:631
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--author-date-order"
msgstr "--author-date-order"
@@ -70315,7 +70315,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:670
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--objects"
msgstr "--objects"
@@ -70329,7 +70329,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:676
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--objects-edge"
msgstr "--objects-edge"
@@ -70344,7 +70344,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:683
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--objects-edge-aggressive"
msgstr "--objects-edge-aggressive"
@@ -70358,7 +70358,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:688
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--indexed-objects"
msgstr "--indexed-objects"
@@ -70394,7 +70394,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:707
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--do-walk"
msgstr "--do-walk"
@@ -70419,7 +70419,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:721
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--relative-date"
msgstr "--relative-date"
@@ -70548,7 +70548,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:781
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--header"
msgstr "--header"
@@ -70568,7 +70568,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:790
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--children"
msgstr "--children"
@@ -70581,7 +70581,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:795
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--timestamp"
msgstr "--timestamp"
@@ -70592,7 +70592,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:799
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--left-right"
msgstr "--left-right"
@@ -70646,7 +70646,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:828
-#, no-wrap, ignore-same
+#, ignore-same, no-wrap
msgid "--graph"
msgstr "--graph"
diff --git a/scripts/pre-translate-po b/scripts/pre-translate-po
index 31d8b854c673594c762fd337d7c7d0ba78316425..da27f77edc9bf09381deba7fe09606214cf1dacc 100755
--- a/scripts/pre-translate-po
+++ b/scripts/pre-translate-po
@@ -14,7 +14,7 @@ def main (f):
or re.fullmatch(r'`?GIT_[A-Z_]+`?', entry.msgid):
entry.msgstr = entry.msgid
entry.flags.append("ignore-same")
- flags = set(entry.flags)
+ flags = sorted(set(entry.flags))
entry.flags = list(flags)
if 'fuzzy' in entry.flags:
entry.flags.remove('fuzzy')