diff options
Diffstat (limited to 'po4a/dgit_1.pot')
-rw-r--r-- | po4a/dgit_1.pot | 503 |
1 files changed, 256 insertions, 247 deletions
diff --git a/po4a/dgit_1.pot b/po4a/dgit_1.pot index 0f36132..c7d489b 100644 --- a/po4a/dgit_1.pot +++ b/po4a/dgit_1.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2019-09-14 20:40+0100\n" +"POT-Creation-Date: 2020-02-02 16:50+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -418,7 +418,7 @@ msgid "B<dgit help>" msgstr "" #. type: Plain text -#: ../dgit.1:185 ../dgit.1:1271 +#: ../dgit.1:185 ../dgit.1:1278 msgid "Print a usage summary." msgstr "" @@ -595,7 +595,7 @@ msgid "" msgstr "" #. type: =item -#: ../dgit.1:286 ../dgit-maint-merge.7.pod:476 +#: ../dgit.1:286 ../dgit-maint-merge.7.pod:479 #, no-wrap msgid "1." msgstr "" @@ -607,7 +607,7 @@ msgid "Clone on build host (dgit clone)" msgstr "" #. type: =item -#: ../dgit.1:287 ../dgit-maint-merge.7.pod:480 +#: ../dgit.1:287 ../dgit-maint-merge.7.pod:483 #, no-wrap msgid "2." msgstr "" @@ -619,7 +619,7 @@ msgid "Edit code on build host (edit, git commit)" msgstr "" #. type: =item -#: ../dgit.1:288 ../dgit-maint-merge.7.pod:485 +#: ../dgit.1:288 ../dgit-maint-merge.7.pod:488 #, no-wrap msgid "3." msgstr "" @@ -956,7 +956,7 @@ msgid "This function is primarily provided for the benefit of git-debrebase." msgstr "" #. type: =head1 -#: ../dgit.1:496 ../git-debrebase.1.pod:476 +#: ../dgit.1:496 ../git-debrebase.1.pod:477 #, no-wrap msgid "OPTIONS" msgstr "" @@ -1274,22 +1274,23 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:683 +#: ../dgit.1:685 msgid "" "This option is useful if you are the maintainer, and you have incorporated " "NMU changes into your own git workflow in a way that doesn't make your " -"branch a fast forward from the NMU." +"branch a fast forward from the NMU. It can also be useful when there was an " +"upload made without dgit since the most recent upload made with dgit." msgstr "" #. type: Plain text -#: ../dgit.1:689 +#: ../dgit.1:691 msgid "" "This option is also usually necessary the first time a package is pushed " "with dgit push to a particular suite. See B<dgit-maint->I<*>B<(7)>." msgstr "" #. type: Plain text -#: ../dgit.1:703 +#: ../dgit.1:705 msgid "" "If I<previous-version> is not specified, dgit will check that the version in " "the archive is mentioned in your debian/changelog. (This will avoid losing " @@ -1300,7 +1301,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:709 +#: ../dgit.1:711 msgid "" "dgit push --overwrite will, if necessary, make a pseudo-merge (that is, " "something that looks like the result of git merge -s ours) to stitch the " @@ -1309,7 +1310,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:714 +#: ../dgit.1:716 msgid "" "(In quilt mode B<gbp>, B<dpm>, B<unpatched> or B<baredebian>*, implying a " "split between the dgit view and the maintainer view, the pseudo-merge will " @@ -1317,18 +1318,18 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:714 +#: ../dgit.1:716 #, no-wrap msgid "B<--delayed>=I<days>" msgstr "" #. type: Plain text -#: ../dgit.1:717 +#: ../dgit.1:719 msgid "Upload to a DELAYED queue." msgstr "" #. type: Plain text -#: ../dgit.1:727 +#: ../dgit.1:729 msgid "" "B<WARNING:> If the maintainer responds by cancelling your upload from the " "queue, and does not make an upload of their own, this will not rewind the " @@ -1338,27 +1339,27 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:732 +#: ../dgit.1:734 msgid "" "If this situation arises, someone should make a suitable dgit push to update " "the contents of dgit-repos to a version without the controversial changes." msgstr "" #. type: TP -#: ../dgit.1:732 +#: ../dgit.1:734 #, no-wrap msgid "B<--no-chase-dsc-distro>" msgstr "" #. type: Plain text -#: ../dgit.1:738 +#: ../dgit.1:740 msgid "" "Tells dgit not to look online for additional git repositories containing " "information about a particular .dsc being imported. Chasing is the default." msgstr "" #. type: Plain text -#: ../dgit.1:748 +#: ../dgit.1:750 msgid "" "For most operations (such as fetch and pull), disabling chasing means dgit " "will access only the git server for the distro you are directly working " @@ -1367,7 +1368,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:756 +#: ../dgit.1:758 msgid "" "Disabling chasing can be hazardous: if the .dsc names a git commit which has " "been rewritten by those in charge of the distro, this option may prevent " @@ -1376,13 +1377,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:756 +#: ../dgit.1:758 #, no-wrap msgid "B<--save-dgit-view=>I<branch>|I<ref>" msgstr "" #. type: Plain text -#: ../dgit.1:766 +#: ../dgit.1:768 msgid "" "Specifies that when split view is in operation, and dgit calculates (or " "looks up in its cache) a dgit view corresponding to your HEAD, the dgit " @@ -1391,7 +1392,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:770 +#: ../dgit.1:772 msgid "" "This option is effective only with the following operations: quilt-fixup; " "push; all builds. And it is only effective when split view is actually in " @@ -1399,25 +1400,25 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:774 +#: ../dgit.1:776 msgid "" "If ref does not start with refs/ it is taken to be a branch - i.e. refs/" "heads/ is prepended." msgstr "" #. type: Plain text -#: ../dgit.1:778 +#: ../dgit.1:780 msgid "B<--dgit-view-save> is a deprecated alias for --save-dgit-view." msgstr "" #. type: TP -#: ../dgit.1:778 +#: ../dgit.1:780 #, no-wrap msgid "B<--deliberately->I<something>" msgstr "" #. type: Plain text -#: ../dgit.1:792 +#: ../dgit.1:794 msgid "" "Declare that you are deliberately doing I<something>. This can be used to " "override safety catches, including safety catches which relate to distro-" @@ -1429,22 +1430,30 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:792 +#: ../dgit.1:794 #, no-wrap msgid "B<--deliberately-not-fast-forward>" msgstr "" #. type: Plain text -#: ../dgit.1:799 +#: ../dgit.1:800 msgid "" -"Declare that you are deliberately rewinding history. When pushing to " -"Debian, use this when you are making a renewed upload of an entirely new " -"source package whose previous version was not accepted for release from NEW " -"because of problems with copyright or redistributibility." +"Declare that you are deliberately rewriting history. This could be because " +"your branch is not fast forward from the dgit server history, or not fast " +"forward from a locally-synthesised dsc import." msgstr "" #. type: Plain text -#: ../dgit.1:810 +#: ../dgit.1:806 +msgid "" +"When pushing to Debian, use this only when you are making a renewed upload " +"of an entirely new source package whose previous version was not accepted " +"for release from NEW because of problems with copyright or " +"redistributibility; or, exceptionally, for the very first upload with dgit." +msgstr "" + +#. type: Plain text +#: ../dgit.1:817 msgid "" "When split view is in operation, this also prevents the construction by dgit " "of a pseudomerge to make the dgit view fast forwarding. Normally only one " @@ -1454,13 +1463,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:810 +#: ../dgit.1:817 #, no-wrap msgid "B<--deliberately-include-questionable-history>" msgstr "" #. type: Plain text -#: ../dgit.1:819 +#: ../dgit.1:826 msgid "" "Declare that you are deliberately including, in the git history of your " "current push, history which contains a previously-submitted version of this " @@ -1472,27 +1481,27 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:819 +#: ../dgit.1:826 #, no-wrap msgid "B<--deliberately-fresh-repo>" msgstr "" #. type: Plain text -#: ../dgit.1:824 +#: ../dgit.1:831 msgid "" -"Declare that you are deliberately rewinding history and want to throw away " +"Declare that you are deliberately rewriting history and want to throw away " "the existing repo. Not relevant when pushing to Debian, as the Debian " "server will do this automatically when necessary." msgstr "" #. type: =item -#: ../dgit.1:824 ../git-debpush.1.pod:114 +#: ../dgit.1:831 ../git-debpush.1.pod:114 #, no-wrap msgid "B<--quilt=linear>" msgstr "" #. type: Plain text -#: ../dgit.1:831 +#: ../dgit.1:838 msgid "" "When fixing up source format `3.0 (quilt)' metadata, insist on generating a " "linear patch stack: one new patch for each relevant commit. If such a stack " @@ -1500,20 +1509,20 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:836 +#: ../dgit.1:843 msgid "" "HEAD should be a series of plain commits (not touching debian/patches/), and " "pseudomerges, with as ancestor a patches-applied branch." msgstr "" #. type: =item -#: ../dgit.1:836 ../git-debpush.1.pod:126 +#: ../dgit.1:843 ../git-debpush.1.pod:126 #, no-wrap msgid "B<--quilt=auto>" msgstr "" #. type: Plain text -#: ../dgit.1:845 +#: ../dgit.1:852 msgid "" "When fixing up source format `3.0 (quilt)' metadata, prefer to generate a " "linear patch stack (as with --quilt=linear) but if that doesn't seem " @@ -1523,13 +1532,13 @@ msgid "" msgstr "" #. type: =item -#: ../dgit.1:845 ../git-debpush.1.pod:120 +#: ../dgit.1:852 ../git-debpush.1.pod:120 #, no-wrap msgid "B<--quilt=smash>" msgstr "" #. type: Plain text -#: ../dgit.1:850 +#: ../dgit.1:857 msgid "" "When fixing up source format `3.0 (quilt)' metadata, generate a single " "additional patch for all the changes made in git. This is not a good idea " @@ -1537,7 +1546,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:856 +#: ../dgit.1:863 msgid "" "(If HEAD has any in-tree patches already, they must apply cleanly. This " "will be the case for any trees produced by dgit fetch or clone; if you do " @@ -1546,13 +1555,13 @@ msgid "" msgstr "" #. type: =item -#: ../dgit.1:856 ../git-debpush.1.pod:131 +#: ../dgit.1:863 ../git-debpush.1.pod:131 #, no-wrap msgid "B<--quilt=nofix>" msgstr "" #. type: Plain text -#: ../dgit.1:864 +#: ../dgit.1:871 msgid "" "Check whether source format `3.0 (quilt)' metadata would need fixing up, " "but, if it does, fail. You must then fix the metadata yourself somehow " @@ -1561,13 +1570,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:864 +#: ../dgit.1:871 #, no-wrap msgid "B<--quilt=nocheck> | B<--no-quilt-fixup>" msgstr "" #. type: Plain text -#: ../dgit.1:869 +#: ../dgit.1:876 msgid "" "Do not check whether source format `3.0 (quilt)' metadata needs fixing up. " "If you use this option and the metadata did in fact need fixing up, dgit " @@ -1575,27 +1584,27 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:869 +#: ../dgit.1:876 #, no-wrap msgid "B<-->[B<quilt=>]B<gbp> | B<-->[B<quilt=>]B<dpm> | B<--quilt=unapplied> | B<-->[B<quilt=>]B<baredebian>[B<+git>|B<+tarball>]" msgstr "" #. type: Plain text -#: ../dgit.1:876 +#: ../dgit.1:883 msgid "" "Tell dgit that you are using a nearly-dgit-compatible git branch, aka a " "B<maintainer view>, and do not want your branch changed by dgit." msgstr "" #. type: Plain text -#: ../dgit.1:880 +#: ../dgit.1:887 msgid "" "These quilt modes are known as B<splitting quilt modes>. See --split-view, " "below." msgstr "" #. type: Plain text -#: ../dgit.1:888 +#: ../dgit.1:895 msgid "" "B<--gbp> (short for B<--quilt=gbp>) is for use with git-buildpackage. Your " "HEAD is expected to be a patches-unapplied git branch, except that it might " @@ -1604,7 +1613,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:896 +#: ../dgit.1:903 msgid "" "B<--dpm> (short for B<--quilt=dpm>) is for use with git-dpm. Your HEAD is " "expected to be a patches-applied git branch, except that it might contain " @@ -1612,7 +1621,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:901 +#: ../dgit.1:908 msgid "" "B<--quilt=unapplied> specifies that your HEAD is a patches-unapplied git " "branch (and that any changes to upstream .gitignore files are represented as " @@ -1620,7 +1629,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:915 +#: ../dgit.1:922 msgid "" "B<--quilt=baredebian> (or its alias B<--quilt=baredebian+git>) specifies " "that your HEAD contains only a debian/ directory, with any changes to " @@ -1632,7 +1641,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:926 +#: ../dgit.1:933 msgid "" "B<--quilt=baredebian+tarball> is like --quilt=baredebian, but is used when " "there is no appropriate upstream git history. To construct the dgit view, " @@ -1643,7 +1652,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:944 +#: ../dgit.1:951 msgid "" "With --quilt=gbp|dpm|unapplied|baredebian*, dgit push (or precursors like " "quilt-fixup and build) will automatically generate a conversion of your git " @@ -1657,7 +1666,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:953 +#: ../dgit.1:960 msgid "" "B<If you have a branch like this it is essential to specify the appropriate " "--quilt= option!> This is because it is not always possible to tell: a " @@ -1669,13 +1678,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:953 +#: ../dgit.1:960 #, no-wrap msgid "B<-d>I<distro> | B<--distro=>I<distro>" msgstr "" #. type: Plain text -#: ../dgit.1:962 +#: ../dgit.1:969 msgid "" "Specifies that the suite to be operated on is part of distro I<distro>. " "This overrides the default value found from the git config option B<dgit-" @@ -1685,7 +1694,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:968 +#: ../dgit.1:975 msgid "" "If your suite is part of a distro that dgit already knows about, you can use " "this option to make dgit work even if your dgit doesn't know about the " @@ -1694,7 +1703,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:973 +#: ../dgit.1:980 msgid "" "To define a new distro it is necessary to define methods and URLs for " "fetching (and, for dgit push, altering) a variety of information both in the " @@ -1702,20 +1711,20 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:973 +#: ../dgit.1:980 #, no-wrap msgid "B<--split-view=auto>|B<always>|B<never>" msgstr "" #. type: Plain text -#: ../dgit.1:978 +#: ../dgit.1:985 msgid "" "Controls whether dgit operates a split view, separating your own branch (as " "Debian maintainer) from that shown to users of dgit clone and dgit fetch." msgstr "" #. type: Plain text -#: ../dgit.1:986 +#: ../dgit.1:993 msgid "" "When split view is in operation dgit will not make or merge any commits onto " "your own branch. Specifically, only the dgit view will contain dgit's " @@ -1725,7 +1734,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:992 +#: ../dgit.1:999 msgid "" "B<auto> is the default, and splits the view only when needed: i.e., when you " "are working with a `3.0 (quilt)' source package and a splitting quilt mode: " @@ -1733,18 +1742,18 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:995 +#: ../dgit.1:1002 msgid "" "B<always> splits the view regardless of the source format and the quilt mode." msgstr "" #. type: Plain text -#: ../dgit.1:998 +#: ../dgit.1:1005 msgid "B<never> will cause dgit to fail if split view is needed." msgstr "" #. type: Plain text -#: ../dgit.1:1006 +#: ../dgit.1:1013 msgid "" "When split view is in operation, the dgit view is visible in your local git " "clone, but only in refs specific to dgit: notably B<remotes/dgit/dgit/" @@ -1752,20 +1761,20 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1009 +#: ../dgit.1:1016 msgid "" "Note that split view does not affect dgit fetch, and is not compatible with " "dgit pull." msgstr "" #. type: TP -#: ../dgit.1:1009 +#: ../dgit.1:1016 #, no-wrap msgid "B<-C>I<changesfile>" msgstr "" #. type: Plain text -#: ../dgit.1:1014 +#: ../dgit.1:1021 msgid "" "Specifies the .changes file which is to be uploaded. By default dgit push " "looks for a single .changes file in the parent directory whose filename " @@ -1773,7 +1782,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1023 +#: ../dgit.1:1030 msgid "" "If the specified I<changesfile> pathname contains slashes, the directory " "part is also used as the value for B<--build-products-dir>; otherwise, the " @@ -1781,13 +1790,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1023 +#: ../dgit.1:1030 #, no-wrap msgid "B<--upstream-commitish=>I<upstream>" msgstr "" #. type: Plain text -#: ../dgit.1:1031 +#: ../dgit.1:1038 msgid "" "For use with --quilt=baredebian only. Specifies the commit containing the " "upstream source. This commit must be identical to your .orig tarball. The " @@ -1796,13 +1805,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1031 +#: ../dgit.1:1038 #, no-wrap msgid "B<--rm-old-changes>" msgstr "" #. type: Plain text -#: ../dgit.1:1043 +#: ../dgit.1:1050 msgid "" "When doing a build, delete any changes files matching " "I<package>B<_>I<version>B<_*.changes> before starting. This ensures that " @@ -1814,32 +1823,32 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1046 +#: ../dgit.1:1053 msgid "" "Note that B<dgit push-source> will always find the right .changes, " "regardless of this option." msgstr "" #. type: TP -#: ../dgit.1:1046 +#: ../dgit.1:1053 #, no-wrap msgid "B<--build-products-dir=>I<directory>" msgstr "" #. type: Plain text -#: ../dgit.1:1050 +#: ../dgit.1:1057 msgid "" "Specifies where to find and create tarballs, binary packages, source " "packages, .changes files, and so on." msgstr "" #. type: Plain text -#: ../dgit.1:1053 +#: ../dgit.1:1060 msgid "By default, dgit uses the parent directory (B<..>)." msgstr "" #. type: Plain text -#: ../dgit.1:1062 +#: ../dgit.1:1069 msgid "" "Changing this setting may necessitate moving .orig tarballs to the new " "directory, so it is probably best to use the B<dgit.default.build-products-" @@ -1848,85 +1857,85 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1062 +#: ../dgit.1:1069 #, no-wrap msgid "B<--no-rm-on-error>" msgstr "" #. type: Plain text -#: ../dgit.1:1065 +#: ../dgit.1:1072 msgid "Do not delete the destination directory if clone fails." msgstr "" #. type: TP -#: ../dgit.1:1065 +#: ../dgit.1:1072 #, no-wrap msgid "B<--dep14tag>" msgstr "" #. type: Plain text -#: ../dgit.1:1072 +#: ../dgit.1:1079 msgid "" "Generates a DEP-14 tag (eg B<debian/>I<version>) as well as a dgit tag (eg " "B<archive/debian/>I<version>). This is the default." msgstr "" #. type: TP -#: ../dgit.1:1072 +#: ../dgit.1:1079 #, no-wrap msgid "B<--no-dep14tag>" msgstr "" #. type: Plain text -#: ../dgit.1:1075 +#: ../dgit.1:1082 msgid "Do not generate a DEP-14 tag, except when split view is in operation." msgstr "" #. type: TP -#: ../dgit.1:1075 +#: ../dgit.1:1082 #, no-wrap msgid "B<--always-dep14tag>" msgstr "" #. type: Plain text -#: ../dgit.1:1078 +#: ../dgit.1:1085 msgid "Obsolete alias for --dep14tag, retained for compatibility." msgstr "" #. type: TP -#: ../dgit.1:1078 +#: ../dgit.1:1085 #, no-wrap msgid "B<-D>" msgstr "" #. type: Plain text -#: ../dgit.1:1082 +#: ../dgit.1:1089 msgid "" "Prints debugging information to stderr. Repeating the option produces more " "output (currently, up to -DDDD is meaningfully different)." msgstr "" #. type: TP -#: ../dgit.1:1082 +#: ../dgit.1:1089 #, no-wrap msgid "B<-c>I<name>B<=>I<value>" msgstr "" #. type: Plain text -#: ../dgit.1:1086 +#: ../dgit.1:1093 msgid "" "Specifies a git configuration option, to be used for this run. dgit itself " "is also controlled by git configuration options." msgstr "" #. type: TP -#: ../dgit.1:1086 +#: ../dgit.1:1093 #, no-wrap msgid "B<-v>I<version>|B<_> | B<--since-version=>versionI<|>B<_>" msgstr "" #. type: Plain text -#: ../dgit.1:1095 +#: ../dgit.1:1102 msgid "" "Specifies the B<-v>I<version> option to pass to dpkg-genchanges, during " "builds. Changes (from debian/changelog) since this version will be included " @@ -1936,7 +1945,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1101 +#: ../dgit.1:1108 msgid "" "Specifying B<_> inhibits this, so that no -v option will be passed to dpkg-" "genchanges (and as a result, only the last stanza from debian/changelog will " @@ -1944,30 +1953,30 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1101 +#: ../dgit.1:1108 #, no-wrap msgid "B<-m>I<maintaineraddress>" msgstr "" #. type: Plain text -#: ../dgit.1:1104 +#: ../dgit.1:1111 msgid "Passed to dpkg-genchanges (eventually)." msgstr "" #. type: TP -#: ../dgit.1:1104 +#: ../dgit.1:1111 #, no-wrap msgid "B<--ch:>I<option>" msgstr "" #. type: Plain text -#: ../dgit.1:1108 +#: ../dgit.1:1115 msgid "" "Specifies a single additional option to pass, eventually, to dpkg-genchanges." msgstr "" #. type: Plain text -#: ../dgit.1:1115 +#: ../dgit.1:1122 msgid "" "Options which are safe to pass include B<-C> (and also B<-si -sa -sd> " "although these should never be necessary with Debian since dgit " @@ -1975,18 +1984,18 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1117 +#: ../dgit.1:1124 msgid "For other options the caveat below applies." msgstr "" #. type: TP -#: ../dgit.1:1117 +#: ../dgit.1:1124 #, no-wrap msgid "B<--curl:>I<option> | B<--dput:>I<option> |..." msgstr "" #. type: Plain text -#: ../dgit.1:1139 +#: ../dgit.1:1146 msgid "" "Specifies a single additional option to pass to B<curl>, B<dput>, " "B<debsign>, B<dpkg-source>, B<dpkg-buildpackage>, B<dpkg-genchanges>, " @@ -1996,7 +2005,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1147 +#: ../dgit.1:1154 msgid "" "Use of this ability should not normally be necessary. It is provided for " "working around bugs, or other unusual situations. If you use these options, " @@ -2005,7 +2014,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1152 +#: ../dgit.1:1159 msgid "" "For dpkg-buildpackage, dpkg-genchanges, mergechanges and sbuild, the option " "applies only when the program is invoked directly by dgit. Usually, for " @@ -2013,7 +2022,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1156 +#: ../dgit.1:1163 msgid "" "Specifying --git is not effective for some lower-level read-only git " "operations performed by dgit, and also not when git is invoked by another " @@ -2021,39 +2030,39 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1158 +#: ../dgit.1:1165 msgid "See notes below regarding ssh and dgit." msgstr "" #. type: Plain text -#: ../dgit.1:1166 +#: ../dgit.1:1173 msgid "" "NB that --gpg:option is not supported (because debsign does not have that " "facility). But see B<-k> and the B<keyid> distro config setting." msgstr "" #. type: TP -#: ../dgit.1:1166 +#: ../dgit.1:1173 #, no-wrap msgid "B<--curl!:>I<option> | B<--dput!:>I<option> |..." msgstr "" #. type: Plain text -#: ../dgit.1:1172 +#: ../dgit.1:1179 msgid "" "Specifies an option to remove from the command line for a program called by " "dgit, as for B<-->I<program>B<:>I<option> (and the same caveats apply)." msgstr "" #. type: Plain text -#: ../dgit.1:1177 +#: ../dgit.1:1184 msgid "" "Any options or arguments exactly identical to I<option> are removed. (It is " "not an error if there were none.)" msgstr "" #. type: Plain text -#: ../dgit.1:1184 +#: ../dgit.1:1191 msgid "" "This can only be used to delete options which are always passed by default " "by dgit, or to undo a previous B<-->I<program>B<:>I<option>. It cannot be " @@ -2061,13 +2070,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1184 +#: ../dgit.1:1191 #, no-wrap msgid "B<--curl=>I<program> | B<--dput=>I<program> |..." msgstr "" #. type: Plain text -#: ../dgit.1:1207 +#: ../dgit.1:1214 msgid "" "Specifies alternative programs to use instead of B<curl>, B<dput>, " "B<debsign>, B<dpkg-source>, B<dpkg-buildpackage>, B<dpkg-genchanges>, " @@ -2077,14 +2086,14 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1215 +#: ../dgit.1:1222 msgid "" "For B<dpkg-buildpackage>, B<dpkg-genchanges>, B<mergechanges> and B<sbuild>, " "this applies only when the program is invoked directly by dgit." msgstr "" #. type: Plain text -#: ../dgit.1:1222 +#: ../dgit.1:1229 msgid "" "For B<dgit>, specifies the command to run on the remote host when dgit rpush " "needs to invoke a remote copy of itself. (dgit also reinvokes itself as the " @@ -2093,7 +2102,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1233 +#: ../dgit.1:1240 msgid "" "B<gbp-build>'s value is used instead of gbp build or git-buildpackage. (The " "default is the latter unless the former exists on PATH.) B<gbp-pq>'s value " @@ -2103,7 +2112,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1241 +#: ../dgit.1:1248 msgid "" "For pbuilder and cowbuilder, the defaults are B<sudo -E pbuilder> and B<sudo " "-E cowbuilder> respectively. Like with gbp-build and gbp pq, the specified " @@ -2111,7 +2120,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1258 +#: ../dgit.1:1265 msgid "" "For B<ssh>, the default value is taken from the B<DGIT_SSH> or B<GIT_SSH> " "environment variables, if set (see below). And, for ssh, when accessing the " @@ -2123,13 +2132,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1258 +#: ../dgit.1:1265 #, no-wrap msgid "B<--existing-package=>I<package>" msgstr "" #. type: Plain text -#: ../dgit.1:1268 +#: ../dgit.1:1275 msgid "" "dgit push needs to canonicalise the suite name. Sometimes, dgit lacks a way " "to ask the archive to do this without knowing the name of an existing " @@ -2140,19 +2149,19 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1268 +#: ../dgit.1:1275 #, no-wrap msgid "B<-h>|B<--help>" msgstr "" #. type: TP -#: ../dgit.1:1271 +#: ../dgit.1:1278 #, no-wrap msgid "B<--initiator-tempdir=>I<directory>" msgstr "" #. type: Plain text -#: ../dgit.1:1280 +#: ../dgit.1:1287 msgid "" "dgit rpush uses a temporary directory on the invoking (signing) host. This " "option causes dgit to use I<directory> instead. Furthermore, the specified " @@ -2162,13 +2171,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1280 +#: ../dgit.1:1287 #, no-wrap msgid "B<--force->I<something>" msgstr "" #. type: Plain text -#: ../dgit.1:1288 +#: ../dgit.1:1295 msgid "" "Instructs dgit to try to proceed despite detecting what it thinks is going " "to be a fatal problem. B<This is probably not going to work.> These options " @@ -2177,13 +2186,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1288 +#: ../dgit.1:1295 #, no-wrap msgid "B<--force-import-dsc-with-dgit-field>" msgstr "" #. type: Plain text -#: ../dgit.1:1295 +#: ../dgit.1:1302 msgid "" "Tell dgit import-dsc to treat a .dsc with a Dgit field like one without it. " "The result is a fresh import, discarding the git history that the person who " @@ -2191,13 +2200,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1295 +#: ../dgit.1:1302 #, no-wrap msgid "B<--force-reusing-version>" msgstr "" #. type: Plain text -#: ../dgit.1:1302 +#: ../dgit.1:1309 msgid "" "Carry on even though this involves reusing a version number of a previous " "push or upload. It is normally best to give different versions different " @@ -2206,26 +2215,26 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1302 +#: ../dgit.1:1309 #, no-wrap msgid "B<--force-uploading-binaries>" msgstr "" #. type: Plain text -#: ../dgit.1:1307 +#: ../dgit.1:1314 msgid "" "Carry on and upload binaries even though dgit thinks your distro does not " "permit that." msgstr "" #. type: TP -#: ../dgit.1:1307 +#: ../dgit.1:1314 #, no-wrap msgid "B<--force-uploading-source-only>" msgstr "" #. type: Plain text -#: ../dgit.1:1313 +#: ../dgit.1:1320 msgid "" "Carry on and do a source-only upload, without any binaries, even though dgit " "thinks your distro does not permit that, or does not permit that in this " @@ -2233,13 +2242,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1313 +#: ../dgit.1:1320 #, no-wrap msgid "B<--force-unrepresentable>" msgstr "" #. type: Plain text -#: ../dgit.1:1320 +#: ../dgit.1:1327 msgid "" "Carry on even if dgit thinks that your git tree contains changes (relative " "to your .orig tarballs) which dpkg-source is not able to represent. Your " @@ -2247,65 +2256,65 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1320 +#: ../dgit.1:1327 #, no-wrap msgid "B<--force-changes-origs-exactly>" msgstr "" #. type: Plain text -#: ../dgit.1:1325 +#: ../dgit.1:1332 msgid "" "Use the set of .origs specified in your .changes, exactly, without regard to " "what is in the archive already. The archive may well reject your upload." msgstr "" #. type: TP -#: ../dgit.1:1325 +#: ../dgit.1:1332 #, no-wrap msgid "B<--force-unsupported-source-format>" msgstr "" #. type: Plain text -#: ../dgit.1:1329 +#: ../dgit.1:1336 msgid "" "Carry on despite dgit not understanding your source package format. dgit " "will probably mishandle it." msgstr "" #. type: TP -#: ../dgit.1:1329 +#: ../dgit.1:1336 #, no-wrap msgid "B<--force-dsc-changes-mismatch>" msgstr "" #. type: Plain text -#: ../dgit.1:1333 +#: ../dgit.1:1340 msgid "" "Do not check whether .dsc and .changes match. The archive will probably " "reject your upload." msgstr "" #. type: TP -#: ../dgit.1:1333 +#: ../dgit.1:1340 #, no-wrap msgid "B<--force-import-gitapply-absurd> | B<--force-import-gitapply-no-absurd>" msgstr "" #. type: Plain text -#: ../dgit.1:1339 +#: ../dgit.1:1346 msgid "" "Force on or off the use of the absurd git-apply emulation when running gbp " "pq import when importing a package from a .dsc. See Debian bug #841867." msgstr "" #. type: TP -#: ../dgit.1:1339 +#: ../dgit.1:1346 #, no-wrap msgid "B<--for-push>" msgstr "" #. type: Plain text -#: ../dgit.1:1345 +#: ../dgit.1:1352 msgid "" "Override the dgit-distro.distro.readonly configuration setting, to specify " "that we have read/write access and should use the corresponding git and " @@ -2313,13 +2322,13 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit.1:1345 ../dgit-downstream-dsc.7.pod:150 +#: ../dgit.1:1352 ../dgit-downstream-dsc.7.pod:150 #, no-wrap msgid "CONFIGURATION" msgstr "" #. type: Plain text -#: ../dgit.1:1351 +#: ../dgit.1:1358 msgid "" "dgit can be configured via the git config system. You may set keys with git-" "config (either in system-global or per-tree configuration), or provide B<-" @@ -2327,31 +2336,31 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1353 +#: ../dgit.1:1360 msgid "Settings likely to be useful for an end user include:" msgstr "" #. type: TP -#: ../dgit.1:1353 +#: ../dgit.1:1360 #, no-wrap msgid "B<dgit.default.build-products-dir>" msgstr "" #. type: Plain text -#: ../dgit.1:1359 +#: ../dgit.1:1366 msgid "" "Specifies where to find the built files to be uploaded, when --build-" "products-dir is not specified. The default is the parent directory (B<..>)." msgstr "" #. type: =item -#: ../dgit.1:1359 ../dgit-downstream-dsc.7.pod:286 +#: ../dgit.1:1366 ../dgit-downstream-dsc.7.pod:286 #, no-wrap msgid "B<dgit-suite.>I<suite>B<.distro> I<distro>" msgstr "" #. type: Plain text -#: ../dgit.1:1364 +#: ../dgit.1:1371 msgid "" "Specifies the distro for a suite. dgit keys off the suite name (which " "appears in changelogs etc.), and uses that to determine the distro which is " @@ -2359,73 +2368,73 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1367 +#: ../dgit.1:1374 msgid "I<suite> may be a glob pattern." msgstr "" #. type: TP -#: ../dgit.1:1367 +#: ../dgit.1:1374 #, no-wrap msgid "B<dgit.default.distro>I< distro>" msgstr "" #. type: Plain text -#: ../dgit.1:1370 +#: ../dgit.1:1377 msgid "The default distro for an unknown suite." msgstr "" #. type: Plain text -#: ../dgit.1:1374 +#: ../dgit.1:1381 msgid "" "This is only used if no B</usr/share/distro-info/>I<somedistro>B<.csv> " "mentions the specified suite." msgstr "" #. type: TP -#: ../dgit.1:1374 +#: ../dgit.1:1381 #, no-wrap msgid "B<dgit.default.default-suite>I< suite>" msgstr "" #. type: Plain text -#: ../dgit.1:1377 +#: ../dgit.1:1384 msgid "The default suite (eg for clone)." msgstr "" #. type: TP -#: ../dgit.1:1377 +#: ../dgit.1:1384 #, no-wrap msgid "B<dgit.default.>*" msgstr "" #. type: Plain text -#: ../dgit.1:1382 +#: ../dgit.1:1389 msgid "" "for each B<dgit-distro.>I<distro>B<.>*, the default value used if there is " "no distro-specific setting." msgstr "" #. type: TP -#: ../dgit.1:1382 +#: ../dgit.1:1389 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.clean-mode>" msgstr "" #. type: Plain text -#: ../dgit.1:1386 +#: ../dgit.1:1393 msgid "" "One of the values for the command line --clean= option; used if --clean is " "not specified." msgstr "" #. type: TP -#: ../dgit.1:1386 +#: ../dgit.1:1393 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.clean-mode-newer>" msgstr "" #. type: Plain text -#: ../dgit.1:1392 +#: ../dgit.1:1399 msgid "" "Like .clean-mode, but ignored if the value is unknown to this version of " "dgit. Setting both .clean-mode and .clean-mode-newer is useful to provide a " @@ -2433,45 +2442,45 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1392 +#: ../dgit.1:1399 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.quilt-mode>" msgstr "" #. type: Plain text -#: ../dgit.1:1396 +#: ../dgit.1:1403 msgid "" "One of the values for the command line --quilt= option; used if --quilt is " "not specified." msgstr "" #. type: TP -#: ../dgit.1:1396 +#: ../dgit.1:1403 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.split-view>" msgstr "" #. type: TP -#: ../dgit.1:1398 +#: ../dgit.1:1405 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.rm-old-changes>" msgstr "" #. type: Plain text -#: ../dgit.1:1402 +#: ../dgit.1:1409 msgid "" "Boolean, used if neither --rm-old-changes nor --no-rm-old-changes is " "specified. The default is not to remove." msgstr "" #. type: TP -#: ../dgit.1:1402 +#: ../dgit.1:1409 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.readonly> B<auto>|B<a> | B<true>|B<t>|B<y>|B<1> | B<false>|B<f>|B<n>|B<0>" msgstr "" #. type: Plain text -#: ../dgit.1:1409 +#: ../dgit.1:1416 msgid "" "Whether you have push access to the distro. For Debian, it is OK to use " "auto, which uses readonly mode if you are not pushing right now; but, " @@ -2480,52 +2489,52 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1409 +#: ../dgit.1:1416 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.keyid>" msgstr "" #. type: Plain text -#: ../dgit.1:1413 +#: ../dgit.1:1420 msgid "See also B<-k>." msgstr "" #. type: TP -#: ../dgit.1:1413 +#: ../dgit.1:1420 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.mirror>I< url>" msgstr "" #. type: TP -#: ../dgit.1:1415 +#: ../dgit.1:1422 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.username>" msgstr "" #. type: Plain text -#: ../dgit.1:1418 +#: ../dgit.1:1425 msgid "Not relevant for Debian." msgstr "" #. type: =item -#: ../dgit.1:1418 ../dgit-downstream-dsc.7.pod:242 +#: ../dgit.1:1425 ../dgit-downstream-dsc.7.pod:242 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.upload-host>" msgstr "" #. type: Plain text -#: ../dgit.1:1421 +#: ../dgit.1:1428 msgid "Might be useful if you have an intermediate queue server." msgstr "" #. type: TP -#: ../dgit.1:1421 +#: ../dgit.1:1428 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.user-name>I< >B<dgit-distro.>I<distro>B<.user-email>" msgstr "" #. type: Plain text -#: ../dgit.1:1426 +#: ../dgit.1:1433 msgid "" "Values to configure for user.name and user.email in new git trees. If not " "specified, the DEBFULLNAME and DEBEMAIL environment variables are used, " @@ -2533,26 +2542,26 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1426 +#: ../dgit.1:1433 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.setup-useremail>" msgstr "" #. type: Plain text -#: ../dgit.1:1430 +#: ../dgit.1:1437 msgid "" "Whether to set user.name and user.email in new git trees. True by default. " "Ignored for dgit setup-useremail, which does it anyway." msgstr "" #. type: TP -#: ../dgit.1:1430 +#: ../dgit.1:1437 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.setup-mergechangelogs>" msgstr "" #. type: Plain text -#: ../dgit.1:1435 +#: ../dgit.1:1442 msgid "" "Whether to set up a merge driver which uses dpkg-mergechangelogs for debian/" "changelog. True by default. Ignored for dgit setup-mergechangelogs, which " @@ -2560,13 +2569,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1435 +#: ../dgit.1:1442 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.setup-gitattributes>" msgstr "" #. type: Plain text -#: ../dgit.1:1441 +#: ../dgit.1:1448 msgid "" "Whether to configure .git/info/attributes to suppress checkin/checkout file " "content transformations in new git trees. True by default. Ignored for " @@ -2574,24 +2583,24 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1441 +#: ../dgit.1:1448 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.cmd->I<cmd>" msgstr "" #. type: Plain text -#: ../dgit.1:1447 +#: ../dgit.1:1454 msgid "Program to use instead of I<cmd>. Works like B<-->I<cmd>B<=>... ." msgstr "" #. type: TP -#: ../dgit.1:1447 +#: ../dgit.1:1454 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.opts->I<cmd>" msgstr "" #. type: Plain text -#: ../dgit.1:1459 +#: ../dgit.1:1466 msgid "" "Extra options to pass to I<cmd>. Works like B<-->I<cmd>B<:>... . To pass " "several options, configure multiple values in git config (with git config --" @@ -2601,13 +2610,13 @@ msgid "" msgstr "" #. type: SH -#: ../dgit.1:1459 +#: ../dgit.1:1466 #, no-wrap msgid "ACCESS CONFIGURATION" msgstr "" #. type: Plain text -#: ../dgit.1:1464 +#: ../dgit.1:1471 msgid "" "There are many other settings which specify how a particular distro's " "services (archive and git) are provided. These should not normally be " @@ -2616,204 +2625,204 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1464 +#: ../dgit.1:1471 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.nominal-distro>" msgstr "" #. type: Plain text -#: ../dgit.1:1467 +#: ../dgit.1:1474 msgid "Shown in git tags, Dgit fields, and so on." msgstr "" #. type: TP -#: ../dgit.1:1467 +#: ../dgit.1:1474 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.alias-canon>" msgstr "" #. type: Plain text -#: ../dgit.1:1470 +#: ../dgit.1:1477 msgid "Used for all access configuration lookup." msgstr "" #. type: TP -#: ../dgit.1:1470 +#: ../dgit.1:1477 #, no-wrap msgid "B<dgit-distro.>I<distro>B</push.>*" msgstr "" #. type: Plain text -#: ../dgit.1:1476 +#: ../dgit.1:1483 msgid "" "If set, overrides corresponding non B</push> config when B<readonly=false>, " "or when pushing and B<readonly=auto>." msgstr "" #. type: TP -#: ../dgit.1:1476 +#: ../dgit.1:1483 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-url>" msgstr "" #. type: TP -#: ../dgit.1:1478 +#: ../dgit.1:1485 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-url>[B<-suffix>]" msgstr "" #. type: TP -#: ../dgit.1:1480 +#: ../dgit.1:1487 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-proto>" msgstr "" #. type: TP -#: ../dgit.1:1482 +#: ../dgit.1:1489 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-path>" msgstr "" #. type: TP -#: ../dgit.1:1484 +#: ../dgit.1:1491 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-check> B<true>|B<false>|B<url>|B<ssh-cmd>" msgstr "" #. type: TP -#: ../dgit.1:1486 +#: ../dgit.1:1493 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-check-suffix>" msgstr "" #. type: TP -#: ../dgit.1:1488 +#: ../dgit.1:1495 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.diverts.divert> B<new-distro>|B</>I<distro-suffix>" msgstr "" #. type: TP -#: ../dgit.1:1490 +#: ../dgit.1:1497 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-create>I< >B<ssh-cmd>I<|>B<true>" msgstr "" #. type: TP -#: ../dgit.1:1492 +#: ../dgit.1:1499 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.archive-query> B<ftpmasterapi:> | B<madison:>I<distro> | B<dummycat:>I</path> | B<sshpsql:>I<user>B<@>I<host>B<:>I<dbname>B< >|B< aptget:>" msgstr "" #. type: TP -#: ../dgit.1:1494 +#: ../dgit.1:1501 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.archive-query->(B<url>|B<tls-key>|B<curl-ca-args>)" msgstr "" #. type: TP -#: ../dgit.1:1496 +#: ../dgit.1:1503 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.madison-distro>" msgstr "" #. type: TP -#: ../dgit.1:1498 +#: ../dgit.1:1505 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.archive-query-default-component>" msgstr "" #. type: TP -#: ../dgit.1:1500 +#: ../dgit.1:1507 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.dgit-tag-format>" msgstr "" #. type: TP -#: ../dgit.1:1502 +#: ../dgit.1:1509 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.dep14tag> B<want>|B<no>[|B<always>]" msgstr "" #. type: TP -#: ../dgit.1:1504 +#: ../dgit.1:1511 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.ssh>" msgstr "" #. type: TP -#: ../dgit.1:1506 +#: ../dgit.1:1513 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.sshpsql-dbname>" msgstr "" #. type: TP -#: ../dgit.1:1508 +#: ../dgit.1:1515 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.>(B<git>|B<sshpsql>)B<->(B<user>|B<host>|B<user-force>)" msgstr "" #. type: TP -#: ../dgit.1:1510 +#: ../dgit.1:1517 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.backports-quirk>" msgstr "" #. type: TP -#: ../dgit.1:1512 +#: ../dgit.1:1519 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.rewrite-map-enable>" msgstr "" #. type: TP -#: ../dgit.1:1514 +#: ../dgit.1:1521 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.source-only-uploads> B<ok>|B<always>|B<never>|B<not-wholly-new>" msgstr "" #. type: TP -#: ../dgit.1:1516 +#: ../dgit.1:1523 #, no-wrap msgid "B<dgit.default.old-dsc-distro>" msgstr "" #. type: TP -#: ../dgit.1:1518 +#: ../dgit.1:1525 #, no-wrap msgid "B<dgit.dsc-url-proto-ok.>I<protocol>" msgstr "" #. type: TP -#: ../dgit.1:1520 +#: ../dgit.1:1527 #, no-wrap msgid "B<dgit.dsc-url-proto-ok.bad-syntax>" msgstr "" #. type: TP -#: ../dgit.1:1522 +#: ../dgit.1:1529 #, no-wrap msgid "B<dgit.default.dsc-url-proto-ok>" msgstr "" #. type: TP -#: ../dgit.1:1524 +#: ../dgit.1:1531 #, no-wrap msgid "B<dgit.vcs-git.suites> I<suite>[B<;>...]" msgstr "" #. type: SH -#: ../dgit.1:1526 +#: ../dgit.1:1533 #, no-wrap msgid "ENVIRONMENT VARIABLES" msgstr "" #. type: TP -#: ../dgit.1:1527 +#: ../dgit.1:1534 #, no-wrap msgid "B<DGIT_SSH>, B<GIT_SSH>" msgstr "" #. type: Plain text -#: ../dgit.1:1536 +#: ../dgit.1:1543 msgid "" "specify an alternative default program (and perhaps arguments) to use " "instead of ssh. DGIT_SSH is consulted first and may contain arguments; if " @@ -2823,26 +2832,26 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1536 +#: ../dgit.1:1543 #, no-wrap msgid "B<DEBEMAIL>, B<DEBFULLNAME>" msgstr "" #. type: Plain text -#: ../dgit.1:1540 +#: ../dgit.1:1547 msgid "" "Default git user.email and user.name for new trees. See B<dgit setup-new-" "tree>." msgstr "" #. type: TP -#: ../dgit.1:1540 +#: ../dgit.1:1547 #, no-wrap msgid "B<gpg>, B<dpkg->..., B<debsign>, B<git>, [B<lib>]B<curl>, B<dput>" msgstr "" #. type: Plain text -#: ../dgit.1:1545 +#: ../dgit.1:1552 msgid "" "and other subprograms and modules used by dgit are affected by various " "environment variables. Consult the documentation for those programs for " @@ -2850,13 +2859,13 @@ msgid "" msgstr "" #. type: SH -#: ../dgit.1:1545 +#: ../dgit.1:1552 #, no-wrap msgid "BUGS" msgstr "" #. type: Plain text -#: ../dgit.1:1552 +#: ../dgit.1:1559 msgid "" "There should be a `dgit rebase-prep' command or some such to turn a fast-" "forwarding branch containing pseudo-merges back into a rebasing patch " @@ -2864,7 +2873,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1558 +#: ../dgit.1:1565 msgid "" "If the dgit push fails halfway through, it is not necessarily restartable " "and idempotent. It would be good to check that the proposed signing key is " @@ -2872,7 +2881,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1563 +#: ../dgit.1:1570 msgid "" "dgit's build functions, and dgit push, may make changes to your current " "HEAD. Sadly this is necessary for packages in the `3.0 (quilt)' source " @@ -2881,7 +2890,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1568 +#: ../dgit.1:1575 msgid "" "--dry-run does not always work properly, as not doing some of the git " "fetches may result in subsequent actions being different. Doing a non-dry-" @@ -2889,25 +2898,25 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit.1:1568 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit.1:1575 ../dgit.7:23 ../dgit-user.7.pod:447 #: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126 -#: ../dgit-maint-merge.7.pod:521 ../dgit-maint-gbp.7.pod:136 -#: ../dgit-maint-debrebase.7.pod:778 ../dgit-downstream-dsc.7.pod:352 +#: ../dgit-maint-merge.7.pod:524 ../dgit-maint-gbp.7.pod:136 +#: ../dgit-maint-debrebase.7.pod:782 ../dgit-downstream-dsc.7.pod:352 #: ../dgit-sponsorship.7.pod:321 ../dgit-maint-bpo.7.pod:140 -#: ../git-debrebase.1.pod:633 ../git-debrebase.5.pod:678 +#: ../git-debrebase.1.pod:634 ../git-debrebase.5.pod:678 #: ../git-debpush.1.pod:261 #, no-wrap msgid "SEE ALSO" msgstr "" #. type: Plain text -#: ../dgit.1:1577 +#: ../dgit.1:1584 msgid "" "B<dgit>(7), B<dgit-*>(7), B<curl>(1), B<dput>(1), B<debsign>(1), B<git-" "config>(1), B<git-buildpackage>(1), B<dpkg-buildpackage>(1)," msgstr "" #. type: Plain text -#: ../dgit.1:1578 +#: ../dgit.1:1585 msgid "https://browse.dgit.debian.org/" msgstr "" |