diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-10-13 20:41:46 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-10-13 20:41:46 +0100 |
commit | 595da25c3a797d654941b6867313eb8f5430cc50 (patch) | |
tree | 236393fb3f18d85a7c02afe558ab8b17ced5b2b3 /po4a/dgit_1.pot | |
parent | 53063f2ca0239bb803e20a2f77d58aefad2fa01d (diff) |
i18n-commit - autogenerated
Diffstat (limited to 'po4a/dgit_1.pot')
-rw-r--r-- | po4a/dgit_1.pot | 570 |
1 files changed, 316 insertions, 254 deletions
diff --git a/po4a/dgit_1.pot b/po4a/dgit_1.pot index 8a7fd86..ff4a730 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: 2018-10-04 01:04+0100\n" +"POT-Creation-Date: 2018-10-13 20:41+0100\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" @@ -317,7 +317,7 @@ msgstr "" #. type: Plain text #: ../dgit.1:137 msgid "" -"dgit checkout will normally need to aceess the archive server, to " +"dgit checkout will normally need to access the archive server, to " "canonicalise the provided suite name. The exception is if you specify the " "canonical name, and the branch (or tracking branch) already exists." msgstr "" @@ -345,8 +345,8 @@ msgstr "" #. type: Plain text #: ../dgit.1:152 msgid "" -"dgit's build operations access the the network, to get the -v option right. " -"See -v, below." +"dgit's build operations access the network, to get the -v option right. See " +"-v, below." msgstr "" #. type: TP @@ -417,7 +417,7 @@ msgid "B<dgit help>" msgstr "" #. type: Plain text -#: ../dgit.1:185 ../dgit.1:1123 +#: ../dgit.1:185 ../dgit.1:1168 msgid "Print a usage summary." msgstr "" @@ -843,7 +843,7 @@ msgstr "" #. type: Plain text #: ../dgit.1:428 -msgid "There is only only sub-option:" +msgid "There is only one sub-option:" msgstr "" #. type: Plain text @@ -859,7 +859,7 @@ msgstr "" #: ../dgit.1:453 msgid "" "If I<branch> is prefixed with B<+> then if it already exists, it will be " -"simply ovewritten, no matter its existing contents. If I<branch> is " +"simply overwritten, no matter its existing contents. If I<branch> is " "prefixed with B<..> then if it already exists and dgit actually imports the " "dsc (rather than simply reading the git commit out of the Dgit field), dgit " "will make a pseudomerge so that the result is necessarily fast forward from " @@ -919,7 +919,7 @@ msgstr "" #: ../dgit.1:476 msgid "" "Prints the -i and -I arguments which must be passed to dpkg-souce to cause " -"it to exclude exactly the .git diredcory and nothing else. The separate " +"it to exclude exactly the .git directory and nothing else. The separate " "arguments are unquoted, separated by spaces, and do not contain spaces." msgstr "" @@ -1054,41 +1054,46 @@ msgid "" "dependencies." msgstr "" -#. type: TP -#: ../dgit.1:541 -#, no-wrap -msgid "B<--clean=git-ff> | B<-wgf>" -msgstr "" - #. type: Plain text -#: ../dgit.1:550 +#: ../dgit.1:555 msgid "" +"dgit will only actually clean the tree if it needs to (because it needs to " +"build the source package or binaries from your working tree). Otherwise any " +"untracked files will be simply ignored. p.TP B<--clean=git-ff> | B<-wgf> " "Use B<git clean -xdff> to clean the working tree. Like git clean -xdf but " "it also removes any subdirectories containing different git trees (which " "only unusual packages are likely to create)." msgstr "" #. type: TP -#: ../dgit.1:550 +#: ../dgit.1:555 #, no-wrap -msgid "B<--clean=check> | B<-wc>" +msgid "B<--clean=check> | B<--clean=check,ignores> | B<-wc> | B<-wci>" msgstr "" #. type: Plain text -#: ../dgit.1:556 +#: ../dgit.1:561 msgid "" "Merely check that the tree is clean (does not contain uncommitted files). " "Avoids running rules clean, and can avoid needing the build-dependencies." msgstr "" +#. type: Plain text +#: ../dgit.1:572 +msgid "" +"With B<,ignores> or B<-wci>, untracked files covered by .gitignore are " +"tolerated, so only files which show up as B<?> in git status (ie, ones you " +"maybe forgot to git add) are treated as a problem." +msgstr "" + #. type: TP -#: ../dgit.1:556 +#: ../dgit.1:572 #, no-wrap msgid "B<--clean=none> | B<-wn>" msgstr "" #. type: Plain text -#: ../dgit.1:564 +#: ../dgit.1:580 msgid "" "Do not clean the tree, nor check that it is clean. Avoids running rules " "clean, and can avoid needing the build-dependencies. If there are files " @@ -1097,42 +1102,85 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:564 +#: ../dgit.1:580 #, no-wrap -msgid "B<--clean=dpkg-source> | B<-wd>" +msgid "B<--clean=dpkg-source>[B<-d>] | B<-wd> | B<-wdd>" msgstr "" #. type: Plain text -#: ../dgit.1:570 +#: ../dgit.1:585 msgid "" "Use dpkg-buildpackage to do the clean, so that the source package is cleaned " -"by dpkg-source running the package's clean target. This is the default. " -"Requires the package's build dependencies." +"by dpkg-source running the package's clean target. --clean=dpkg-source is " +"the default." +msgstr "" + +#. type: Plain text +#: ../dgit.1:589 +msgid "Without the extra B<d>, requires the package's build dependencies." +msgstr "" + +#. type: Plain text +#: ../dgit.1:599 +msgid "" +"With B<...>-d or B<-wdd>, the build-dependencies are not checked (due to " +"passing B<-d> to dpkg-buildpackage), which violates policy, but may work in " +"practice." +msgstr "" + +#. type: Plain text +#: ../dgit.1:606 +msgid "" +"The rules clean target will only be run if it is needed: when dgit is going " +"to build source or binary packages from your working tree, rather than from " +"your git branch (for example because of --include-dirty or because the " +"binary package build uses your working tree)." +msgstr "" + +#. type: Plain text +#: ../dgit.1:616 +msgid "" +"In all cases, dgit will check that there are (after rules clean, if " +"applicable) no untracked un-ignored files, in case these are files you " +"forgot to git add. (Except that this check is not done for a `3.0 (quilt)' " +"package when dgit has to apply patches, dirtily, to the working tree.) If " +"your package does not have a good .gitignore you will probably need --" +"clean=dpkg-source,no-check aka -wdn." msgstr "" #. type: TP -#: ../dgit.1:570 +#: ../dgit.1:616 #, no-wrap -msgid "B<--clean=dpkg-source-d> | B<-wdd>" +msgid "B<--clean=dpkg-source>[B<-d>]B<,no-check> | B<-wdn> | B<-wddn>" msgstr "" #. type: Plain text -#: ../dgit.1:580 +#: ../dgit.1:620 msgid "" -"Use B<dpkg-buildpackage -d> to do the clean, so that the source package is " -"cleaned by dpkg-source running the package's clean target. The build-" -"dependencies are not checked (due to B<-d>), which violates policy, but may " -"work in practice." +"Like --clean=dpkg-source, but does not care about untracked un-ignored files." msgstr "" #. type: TP -#: ../dgit.1:580 +#: ../dgit.1:620 +#, no-wrap +msgid "B<--clean=dpkg-source>[B<-d>]B<,all-check> | B<-wda> | B<-wdda>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:625 +msgid "" +"Like --clean=dpkg-source, but fails even on ignored untracked files. This " +"could perhaps be used to detect bugs in your rules clean target." +msgstr "" + +#. type: TP +#: ../dgit.1:625 #, no-wrap msgid "B<-N> | B<--new>" msgstr "" #. type: Plain text -#: ../dgit.1:586 +#: ../dgit.1:631 msgid "" "The package is or may be new in this suite. Without this, dgit will refuse " "to push. It may (for Debian, will) be unable to access the git history for " @@ -1140,13 +1188,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:586 +#: ../dgit.1:631 #, no-wrap msgid "B<--include-dirty>" msgstr "" #. type: Plain text -#: ../dgit.1:594 +#: ../dgit.1:639 msgid "" "Do not complain if the working tree does not match your git HEAD, and when " "building, include the changes from your working tree. This can be useful " @@ -1156,24 +1204,24 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:594 +#: ../dgit.1:639 #, no-wrap msgid "B<--ignore-dirty>" msgstr "" #. type: Plain text -#: ../dgit.1:597 +#: ../dgit.1:642 msgid "Deprecated alias for --include-dirty." msgstr "" #. type: TP -#: ../dgit.1:597 +#: ../dgit.1:642 #, no-wrap msgid "B<--overwrite>[=I<previous-version>]" msgstr "" #. type: Plain text -#: ../dgit.1:608 +#: ../dgit.1:653 msgid "" "Declare that your HEAD really does contain all the (wanted) changes from all " "versions listed in its changelog; or, all (wanted) changes from I<previous-" @@ -1182,14 +1230,14 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:615 +#: ../dgit.1:660 msgid "" "It is safer not to specify I<previous-version>, and usually it's not " "needed. Just say B<--overwrite>, unless you know what you are doing." msgstr "" #. type: Plain text -#: ../dgit.1:619 +#: ../dgit.1:664 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 " @@ -1197,14 +1245,14 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:625 +#: ../dgit.1:670 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:639 +#: ../dgit.1:684 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 " @@ -1215,7 +1263,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:645 +#: ../dgit.1:690 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 " @@ -1224,7 +1272,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:650 +#: ../dgit.1:695 msgid "" "(In quilt mode B<gbp>, B<dpm> or B<unpatched>, implying a split between the " "dgit view and the maintainer view, the pseudo-merge will appear only in the " @@ -1232,18 +1280,18 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:650 +#: ../dgit.1:695 #, no-wrap msgid "B<--delayed>=I<days>" msgstr "" #. type: Plain text -#: ../dgit.1:653 +#: ../dgit.1:698 msgid "Upload to a DELAYED queue." msgstr "" #. type: Plain text -#: ../dgit.1:663 +#: ../dgit.1:708 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 " @@ -1253,27 +1301,27 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:668 +#: ../dgit.1:713 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:668 +#: ../dgit.1:713 #, no-wrap msgid "B<--no-chase-dsc-distro>" msgstr "" #. type: Plain text -#: ../dgit.1:674 +#: ../dgit.1:719 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:684 +#: ../dgit.1:729 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 " @@ -1282,7 +1330,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:692 +#: ../dgit.1:737 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 " @@ -1291,13 +1339,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:692 +#: ../dgit.1:737 #, no-wrap msgid "B<--save-dgit-view=>I<branch>|I<ref>" msgstr "" #. type: Plain text -#: ../dgit.1:702 +#: ../dgit.1:747 msgid "" "Specifies that when a split view quilt mode is in operation, and dgit " "calculates (or looks up in its cache) a dgit view corresponding to your " @@ -1306,7 +1354,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:709 +#: ../dgit.1:754 msgid "" "This option is effective only with the following operations: quilt-fixup; " "push; all builds. And it is only effective with --[quilt=]gbp, --" @@ -1314,25 +1362,25 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:713 +#: ../dgit.1:758 msgid "" -"If ref does not start with refs/ it is taken to to be a branch - i.e. refs/" +"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:717 +#: ../dgit.1:762 msgid "B<--dgit-view-save> is a deprecated alias for --save-dgit-view." msgstr "" #. type: TP -#: ../dgit.1:717 +#: ../dgit.1:762 #, no-wrap msgid "B<--deliberately->I<something>" msgstr "" #. type: Plain text -#: ../dgit.1:731 +#: ../dgit.1:776 msgid "" "Declare that you are deliberately doing I<something>. This can be used to " "override safety catches, including safety catches which relate to distro-" @@ -1344,13 +1392,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:731 +#: ../dgit.1:776 #, no-wrap msgid "B<--deliberately-not-fast-forward>" msgstr "" #. type: Plain text -#: ../dgit.1:737 +#: ../dgit.1:782 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 " @@ -1359,7 +1407,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:748 +#: ../dgit.1:793 msgid "" "In split view quilt modes, this also prevents the construction by dgit of a " "pseudomerge to make the dgit view fast forwarding. Normally only one of --" @@ -1369,13 +1417,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:748 +#: ../dgit.1:793 #, no-wrap msgid "B<--deliberately-include-questionable-history>" msgstr "" #. type: Plain text -#: ../dgit.1:757 +#: ../dgit.1:802 msgid "" "Declare that you are deliberately including, in the git history of your " "current push, history which contains a previously-submitted version of this " @@ -1387,13 +1435,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:757 +#: ../dgit.1:802 #, no-wrap msgid "B<--deliberately-fresh-repo>" msgstr "" #. type: Plain text -#: ../dgit.1:762 +#: ../dgit.1:807 msgid "" "Declare that you are deliberately rewinding history and want to throw away " "the existing repo. Not relevant when pushing to Debian, as the Debian " @@ -1401,13 +1449,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:762 +#: ../dgit.1:807 #, no-wrap msgid "B<--quilt=linear>" msgstr "" #. type: Plain text -#: ../dgit.1:769 +#: ../dgit.1:814 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 " @@ -1415,20 +1463,20 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:774 +#: ../dgit.1:819 msgid "" "HEAD should be a series of plain commits (not touching debian/patches/), and " "pseudomerges, with as ancestor a patches-applied branch." msgstr "" #. type: TP -#: ../dgit.1:774 +#: ../dgit.1:819 #, no-wrap msgid "B<--quilt=auto>" msgstr "" #. type: Plain text -#: ../dgit.1:783 +#: ../dgit.1:828 msgid "" "When fixing up source format `3.0 (quilt)' metadata, prefer to generate a " "linear patch stack (as with --quilt=auto) but if that doesn't seem " @@ -1438,13 +1486,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:783 +#: ../dgit.1:828 #, no-wrap msgid "B<--quilt=smash>" msgstr "" #. type: Plain text -#: ../dgit.1:788 +#: ../dgit.1:833 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 " @@ -1452,7 +1500,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:794 +#: ../dgit.1:839 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 " @@ -1461,13 +1509,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:794 +#: ../dgit.1:839 #, no-wrap msgid "B<--quilt=nofix>" msgstr "" #. type: Plain text -#: ../dgit.1:802 +#: ../dgit.1:847 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 " @@ -1476,13 +1524,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:802 +#: ../dgit.1:847 #, no-wrap msgid "B<--quilt=nocheck> | B<--no-quilt-fixup>" msgstr "" #. type: Plain text -#: ../dgit.1:807 +#: ../dgit.1:852 msgid "" "Do not check whether up source format `3.0 (quilt)' metadata needs fixing " "up. If you use this option and the metadata did in fact need fixing up, " @@ -1490,20 +1538,20 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:807 +#: ../dgit.1:852 #, no-wrap msgid "B<-->[B<quilt=>]B<gbp> | B<-->[B<quilt=>]B<dpm> | B<--quilt=unapplied>" msgstr "" #. type: Plain text -#: ../dgit.1:814 +#: ../dgit.1:859 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:822 +#: ../dgit.1:867 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 " @@ -1512,7 +1560,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:830 +#: ../dgit.1:875 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 " @@ -1520,7 +1568,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:835 +#: ../dgit.1:880 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 " @@ -1528,7 +1576,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:853 +#: ../dgit.1:898 msgid "" "With --quilt=gbp|dpm|unapplied, dgit push (or precursors like quilt-fixup " "and build) will automatically generate a conversion of your git branch into " @@ -1541,7 +1589,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:862 +#: ../dgit.1:907 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 " @@ -1553,13 +1601,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:862 +#: ../dgit.1:907 #, no-wrap msgid "B<-d>I<distro> | B<--distro=>I<distro>" msgstr "" #. type: Plain text -#: ../dgit.1:871 +#: ../dgit.1:916 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-" @@ -1569,7 +1617,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:877 +#: ../dgit.1:922 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 " @@ -1578,7 +1626,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:882 +#: ../dgit.1:927 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 " @@ -1586,13 +1634,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:882 +#: ../dgit.1:927 #, no-wrap msgid "B<-C>I<changesfile>" msgstr "" #. type: Plain text -#: ../dgit.1:887 +#: ../dgit.1:932 msgid "" "Specifies the .changes file which is to be uploaded. By default dgit push " "looks for single .changes file in the parent directory whose filename " @@ -1600,7 +1648,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:896 +#: ../dgit.1:941 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 " @@ -1608,17 +1656,17 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:896 +#: ../dgit.1:941 #, no-wrap msgid "B<--rm-old-changes>" msgstr "" #. type: Plain text -#: ../dgit.1:908 +#: ../dgit.1:953 msgid "" "When doing a build, delete any changes files matching " "I<package>B<_>I<version>B<_*.changes> before starting. This ensures that " -"dgit push (and dgit sbuild) will be able to unambigously identify the " +"dgit push (and dgit sbuild) will be able to unambiguously identify the " "relevant changes files from the most recent build, even if there have been " "previous builds with different tools or options. The default is not to " "remove, but B<--no-rm-old-changes> can be used to override a previous --rm-" @@ -1626,32 +1674,32 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:911 +#: ../dgit.1:956 msgid "" "Note that B<dgit push-source> will always find the right .changes, " "regardless of this option." msgstr "" #. type: TP -#: ../dgit.1:911 +#: ../dgit.1:956 #, no-wrap msgid "B<--build-products-dir=>I<directory>" msgstr "" #. type: Plain text -#: ../dgit.1:915 +#: ../dgit.1:960 msgid "" -"Specifies where to find and create tarballs, binry packages, source " +"Specifies where to find and create tarballs, binary packages, source " "packages, .changes files, and so on." msgstr "" #. type: Plain text -#: ../dgit.1:918 +#: ../dgit.1:963 msgid "By default, dgit uses the parent directory (B<..>)." msgstr "" #. type: Plain text -#: ../dgit.1:927 +#: ../dgit.1:972 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-" @@ -1660,37 +1708,37 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:927 +#: ../dgit.1:972 #, no-wrap msgid "B<--no-rm-on-error>" msgstr "" #. type: Plain text -#: ../dgit.1:930 +#: ../dgit.1:975 msgid "Do not delete the destination directory if clone fails." msgstr "" #. type: TP -#: ../dgit.1:930 +#: ../dgit.1:975 #, no-wrap msgid "B<--dep14tag>" msgstr "" #. type: Plain text -#: ../dgit.1:937 +#: ../dgit.1:982 msgid "" "Generates a DEP-14 tag (eg B<debian/>I<version>) as well as a dgit tag (eg " "B<archive/debian/>I<version>) where possible. This is the default." msgstr "" #. type: TP -#: ../dgit.1:937 +#: ../dgit.1:982 #, no-wrap msgid "B<--no-dep14tag>" msgstr "" #. type: Plain text -#: ../dgit.1:943 +#: ../dgit.1:988 msgid "" "Do not generate a DEP-14 tag, except in split quilt view mode. (On servers " "where only the old tag format is supported, the dgit tag will have the " @@ -1698,52 +1746,52 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:943 +#: ../dgit.1:988 #, no-wrap msgid "B<--dep14tag-always>" msgstr "" #. type: Plain text -#: ../dgit.1:948 +#: ../dgit.1:993 msgid "" "Insist on generating a DEP-14 tag as well as a dgit tag. If the server does " "not support that, dgit push will fail." msgstr "" #. type: TP -#: ../dgit.1:948 +#: ../dgit.1:993 #, no-wrap msgid "B<-D>" msgstr "" #. type: Plain text -#: ../dgit.1:952 +#: ../dgit.1:997 msgid "" "Prints debugging information to stderr. Repeating the option produces more " "output (currently, up to -DDDD is meaningfully different)." msgstr "" #. type: TP -#: ../dgit.1:952 +#: ../dgit.1:997 #, no-wrap msgid "B<-c>I<name>B<=>I<value>" msgstr "" #. type: Plain text -#: ../dgit.1:956 +#: ../dgit.1:1001 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:956 +#: ../dgit.1:1001 #, no-wrap msgid "B<-v>I<version>|B<_> | B<--since-version=>versionI<|>B<_>" msgstr "" #. type: Plain text -#: ../dgit.1:965 +#: ../dgit.1:1010 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 " @@ -1753,7 +1801,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:971 +#: ../dgit.1:1016 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 " @@ -1761,30 +1809,30 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:971 +#: ../dgit.1:1016 #, no-wrap msgid "B<-m>I<maintaineraddress>" msgstr "" #. type: Plain text -#: ../dgit.1:974 +#: ../dgit.1:1019 msgid "Passed to dpkg-genchanges (eventually)." msgstr "" #. type: TP -#: ../dgit.1:974 +#: ../dgit.1:1019 #, no-wrap msgid "B<--ch:>I<option>" msgstr "" #. type: Plain text -#: ../dgit.1:978 +#: ../dgit.1:1023 msgid "" "Specifies a single additional option to pass, eventually, to dpkg-genchanges." msgstr "" #. type: Plain text -#: ../dgit.1:985 +#: ../dgit.1:1030 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 " @@ -1792,18 +1840,18 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:987 +#: ../dgit.1:1032 msgid "For other options the caveat below applies." msgstr "" #. type: TP -#: ../dgit.1:987 +#: ../dgit.1:1032 #, no-wrap msgid "B<--curl:>I<option> | B<--dput:>I<option> |..." msgstr "" #. type: Plain text -#: ../dgit.1:1009 +#: ../dgit.1:1054 msgid "" "Specifies a single additional option to pass to B<curl>, B<dput>, " "B<debsign>, B<dpkg-source>, B<dpkg-buildpackage>, B<dpkg-genchanges>, " @@ -1813,7 +1861,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1017 +#: ../dgit.1:1062 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, " @@ -1822,7 +1870,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1022 +#: ../dgit.1:1067 msgid "" "For dpkg-buildpackage, dpkg-genchanges, mergechanges and sbuild, the option " "applies only when the program is invoked directly by dgit. Usually, for " @@ -1830,7 +1878,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1026 +#: ../dgit.1:1071 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 " @@ -1838,25 +1886,25 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1028 +#: ../dgit.1:1073 msgid "See notes below regarding ssh and dgit." msgstr "" #. type: Plain text -#: ../dgit.1:1036 +#: ../dgit.1:1081 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:1036 +#: ../dgit.1:1081 #, no-wrap msgid "B<--curl=>I<program> | B<--dput=>I<program> |..." msgstr "" #. type: Plain text -#: ../dgit.1:1059 +#: ../dgit.1:1104 msgid "" "Specifies alternative programs to use instead of B<curl>, B<dput>, " "B<debsign>, B<dpkg-source>, B<dpkg-buildpackage>, B<dpkg-genchanges>, " @@ -1866,14 +1914,14 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1067 +#: ../dgit.1:1112 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:1074 +#: ../dgit.1:1119 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 " @@ -1882,7 +1930,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1085 +#: ../dgit.1:1130 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 " @@ -1892,7 +1940,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1093 +#: ../dgit.1:1138 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 " @@ -1900,7 +1948,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1110 +#: ../dgit.1:1155 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 " @@ -1912,13 +1960,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1110 +#: ../dgit.1:1155 #, no-wrap msgid "B<--existing-package=>I<package>" msgstr "" #. type: Plain text -#: ../dgit.1:1120 +#: ../dgit.1:1165 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 " @@ -1929,19 +1977,19 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1120 +#: ../dgit.1:1165 #, no-wrap msgid "B<-h>|B<--help>" msgstr "" #. type: TP -#: ../dgit.1:1123 +#: ../dgit.1:1168 #, no-wrap msgid "B<--initiator-tempdir=>I<directory>" msgstr "" #. type: Plain text -#: ../dgit.1:1132 +#: ../dgit.1:1177 msgid "" "dgit rpush uses a temporary directory on the invoking (signing) host. This " "option causes dgit to use I<directory> instead. Furthermore, the specified " @@ -1951,13 +1999,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1132 +#: ../dgit.1:1177 #, no-wrap msgid "B<--force->I<something>" msgstr "" #. type: Plain text -#: ../dgit.1:1140 +#: ../dgit.1:1185 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 " @@ -1966,13 +2014,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1140 +#: ../dgit.1:1185 #, no-wrap msgid "B<--force-import-dsc-with-dgit-field>" msgstr "" #. type: Plain text -#: ../dgit.1:1147 +#: ../dgit.1:1192 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 " @@ -1980,26 +2028,26 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1147 +#: ../dgit.1:1192 #, no-wrap msgid "B<--force-uploading-binaries>" msgstr "" #. type: Plain text -#: ../dgit.1:1152 +#: ../dgit.1:1197 msgid "" "Carry on and upload binaries even though dgit thinks your distro does not " "permit that." msgstr "" #. type: TP -#: ../dgit.1:1152 +#: ../dgit.1:1197 #, no-wrap msgid "B<--force-uploading-source-only>" msgstr "" #. type: Plain text -#: ../dgit.1:1158 +#: ../dgit.1:1203 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 " @@ -2007,13 +2055,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1158 +#: ../dgit.1:1203 #, no-wrap msgid "B<--force-unrepresentable>" msgstr "" #. type: Plain text -#: ../dgit.1:1165 +#: ../dgit.1:1210 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 " @@ -2021,65 +2069,65 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1165 +#: ../dgit.1:1210 #, no-wrap msgid "B<--force-changes-origs-exactly>" msgstr "" #. type: Plain text -#: ../dgit.1:1170 +#: ../dgit.1:1215 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:1170 +#: ../dgit.1:1215 #, no-wrap msgid "B<--force-unsupported-source-format>" msgstr "" #. type: Plain text -#: ../dgit.1:1174 +#: ../dgit.1:1219 msgid "" "Carry on despite dgit not understanding your source package format. dgit " "will probably mishandle it." msgstr "" #. type: TP -#: ../dgit.1:1174 +#: ../dgit.1:1219 #, no-wrap msgid "B<--force-dsc-changes-mismatch>" msgstr "" #. type: Plain text -#: ../dgit.1:1178 +#: ../dgit.1:1223 msgid "" "Do not check whether .dsc and .changes match. The archive will probably " "reject your upload." msgstr "" #. type: TP -#: ../dgit.1:1178 +#: ../dgit.1:1223 #, no-wrap msgid "B<--force-import-gitapply-absurd> | B<--force-import-gitapply-no-absurd>" msgstr "" #. type: Plain text -#: ../dgit.1:1184 +#: ../dgit.1:1229 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: =head1 -#: ../dgit.1:1184 ../dgit-downstream-dsc.7.pod:150 +#: ../dgit.1:1229 ../dgit-downstream-dsc.7.pod:150 #, no-wrap msgid "CONFIGURATION" msgstr "" #. type: Plain text -#: ../dgit.1:1190 +#: ../dgit.1:1235 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<-" @@ -2087,31 +2135,31 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1192 +#: ../dgit.1:1237 msgid "Settings likely to be useful for an end user include:" msgstr "" #. type: TP -#: ../dgit.1:1192 +#: ../dgit.1:1237 #, no-wrap msgid "B<dgit.default.build-products-dir>" msgstr "" #. type: Plain text -#: ../dgit.1:1198 +#: ../dgit.1:1243 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:1198 ../dgit-downstream-dsc.7.pod:286 +#: ../dgit.1:1243 ../dgit-downstream-dsc.7.pod:286 #, no-wrap msgid "B<dgit-suite.>I<suite>B<.distro> I<distro>" msgstr "" #. type: Plain text -#: ../dgit.1:1203 +#: ../dgit.1:1248 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 " @@ -2119,92 +2167,106 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1206 +#: ../dgit.1:1251 msgid "I<suite> may be a glob pattern." msgstr "" #. type: TP -#: ../dgit.1:1206 +#: ../dgit.1:1251 #, no-wrap msgid "B<dgit.default.distro>I< distro>" msgstr "" #. type: Plain text -#: ../dgit.1:1209 +#: ../dgit.1:1254 msgid "The default distro for an unknown suite." msgstr "" #. type: TP -#: ../dgit.1:1209 +#: ../dgit.1:1254 #, no-wrap msgid "B<dgit.default.default-suite>I< suite>" msgstr "" #. type: Plain text -#: ../dgit.1:1212 +#: ../dgit.1:1257 msgid "The default suite (eg for clone)." msgstr "" #. type: TP -#: ../dgit.1:1212 +#: ../dgit.1:1257 #, no-wrap msgid "B<dgit.default.>*" msgstr "" #. type: Plain text -#: ../dgit.1:1217 +#: ../dgit.1:1262 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:1217 +#: ../dgit.1:1262 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.clean-mode>" msgstr "" #. type: Plain text -#: ../dgit.1:1221 +#: ../dgit.1:1266 msgid "" "One of the values for the command line --clean= option; used if --clean is " "not specified." msgstr "" #. type: TP -#: ../dgit.1:1221 +#: ../dgit.1:1266 #, no-wrap -msgid "B<dgit-distro.>I<distro>B<.quilt-mode>" +msgid "B<dgit-distro.>I<distro>B<.clean-mode-newer>" msgstr "" #. type: Plain text -#: ../dgit.1:1225 +#: ../dgit.1:1272 +msgid "" +"Like .clean-mode, but ignored if the value does not make sense to this " +"version of dgit. Setting both .clean-mode and .clean-mode-newer is useful " +"to provide a single git config compatible with different dgit versions." +msgstr "" + +#. type: TP +#: ../dgit.1:1272 +#, no-wrap +msgid "B<dgit-distro.>I<distro>B<.quilt->" +msgstr "" + +#. type: Plain text +#: ../dgit.1:1276 msgid "" "One of the values for the command line --quilt= option; used if --quilt is " "not specified." msgstr "" #. type: TP -#: ../dgit.1:1225 +#: ../dgit.1:1276 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.rm-old-changes>" msgstr "" #. type: Plain text -#: ../dgit.1:1229 +#: ../dgit.1:1280 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:1229 +#: ../dgit.1:1280 #, 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:1236 +#: ../dgit.1:1287 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, " @@ -2213,52 +2275,52 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1236 +#: ../dgit.1:1287 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.keyid>" msgstr "" #. type: Plain text -#: ../dgit.1:1240 +#: ../dgit.1:1291 msgid "See also B<-k>." msgstr "" #. type: TP -#: ../dgit.1:1240 +#: ../dgit.1:1291 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.mirror>I< url>" msgstr "" #. type: TP -#: ../dgit.1:1242 +#: ../dgit.1:1293 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.username>" msgstr "" #. type: Plain text -#: ../dgit.1:1245 +#: ../dgit.1:1296 msgid "Not relevant for Debian." msgstr "" #. type: =item -#: ../dgit.1:1245 ../dgit-downstream-dsc.7.pod:242 +#: ../dgit.1:1296 ../dgit-downstream-dsc.7.pod:242 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.upload-host>" msgstr "" #. type: Plain text -#: ../dgit.1:1248 +#: ../dgit.1:1299 msgid "Might be useful if you have an intermediate queue server." msgstr "" #. type: TP -#: ../dgit.1:1248 +#: ../dgit.1:1299 #, 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:1253 +#: ../dgit.1:1304 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, " @@ -2266,26 +2328,26 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1253 +#: ../dgit.1:1304 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.setup-useremail>" msgstr "" #. type: Plain text -#: ../dgit.1:1257 +#: ../dgit.1:1308 msgid "" "Whether to set user.name and user.email in new git trees. True by default. " "Ignored for dgit setup-setup-useremail, which does it anyway." msgstr "" #. type: TP -#: ../dgit.1:1257 +#: ../dgit.1:1308 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.setup-mergechangelogs>" msgstr "" #. type: Plain text -#: ../dgit.1:1262 +#: ../dgit.1:1313 msgid "" "Whether to setup a merge driver which uses dpkg-mergechangelogs for debian/" "changelog. True by default. Ignored for dgit setup-mergechangelogs, which " @@ -2293,13 +2355,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1262 +#: ../dgit.1:1313 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.setup-gitattributes>" msgstr "" #. type: Plain text -#: ../dgit.1:1268 +#: ../dgit.1:1319 msgid "" "Whether to configure .git/info/attributes to suppress checkin/checkout file " "content transformations in new git trees. True by default. Ignored for " @@ -2307,24 +2369,24 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1268 +#: ../dgit.1:1319 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.cmd->I<cmd>" msgstr "" #. type: Plain text -#: ../dgit.1:1274 +#: ../dgit.1:1325 msgid "Program to use instead of I<cmd>. Works like B<-->I<cmd>B<=>... ." msgstr "" #. type: TP -#: ../dgit.1:1274 +#: ../dgit.1:1325 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.opts->I<cmd>" msgstr "" #. type: Plain text -#: ../dgit.1:1285 +#: ../dgit.1:1336 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 --" @@ -2334,13 +2396,13 @@ msgid "" msgstr "" #. type: SH -#: ../dgit.1:1285 +#: ../dgit.1:1336 #, no-wrap msgid "ACCESS CONFIGURATION" msgstr "" #. type: Plain text -#: ../dgit.1:1290 +#: ../dgit.1:1341 msgid "" "There are many other settings which specify how a particular distro's " "services (archive and git) are provided. These should not normally be " @@ -2349,204 +2411,204 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1290 +#: ../dgit.1:1341 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.nominal-distro>" msgstr "" #. type: Plain text -#: ../dgit.1:1293 +#: ../dgit.1:1344 msgid "Shown in git tags, Dgit fields, and so on." msgstr "" #. type: TP -#: ../dgit.1:1293 +#: ../dgit.1:1344 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.alias-canon>" msgstr "" #. type: Plain text -#: ../dgit.1:1296 +#: ../dgit.1:1347 msgid "Used for all access configuration lookup." msgstr "" #. type: TP -#: ../dgit.1:1296 +#: ../dgit.1:1347 #, no-wrap msgid "B<dgit-distro.>I<distro>B</push.>*" msgstr "" #. type: Plain text -#: ../dgit.1:1302 +#: ../dgit.1:1353 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:1302 +#: ../dgit.1:1353 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-url>" msgstr "" #. type: TP -#: ../dgit.1:1304 +#: ../dgit.1:1355 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-url>[B<-suffix>]" msgstr "" #. type: TP -#: ../dgit.1:1306 +#: ../dgit.1:1357 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-proto>" msgstr "" #. type: TP -#: ../dgit.1:1308 +#: ../dgit.1:1359 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-path>" msgstr "" #. type: TP -#: ../dgit.1:1310 +#: ../dgit.1:1361 #, 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:1312 +#: ../dgit.1:1363 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-check-suffix>" msgstr "" #. type: TP -#: ../dgit.1:1314 +#: ../dgit.1:1365 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.diverts.divert> B<new-distro>|B</>I<distro-suffix>" msgstr "" #. type: TP -#: ../dgit.1:1316 +#: ../dgit.1:1367 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-create>I< >B<ssh-cmd>I<|>B<true>" msgstr "" #. type: TP -#: ../dgit.1:1318 +#: ../dgit.1:1369 #, 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>" msgstr "" #. type: TP -#: ../dgit.1:1320 +#: ../dgit.1:1371 #, 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:1322 +#: ../dgit.1:1373 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.madison-distro>" msgstr "" #. type: TP -#: ../dgit.1:1324 +#: ../dgit.1:1375 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.archive-query-default-component>" msgstr "" #. type: TP -#: ../dgit.1:1326 +#: ../dgit.1:1377 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.dgit-tag-format>" msgstr "" #. type: TP -#: ../dgit.1:1328 +#: ../dgit.1:1379 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.dep14tag> B<want>|B<no>|B<always>" msgstr "" #. type: TP -#: ../dgit.1:1330 +#: ../dgit.1:1381 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.ssh>" msgstr "" #. type: TP -#: ../dgit.1:1332 +#: ../dgit.1:1383 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.sshpsql-dbname>" msgstr "" #. type: TP -#: ../dgit.1:1334 +#: ../dgit.1:1385 #, 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:1336 +#: ../dgit.1:1387 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.backports-quirk>" msgstr "" #. type: TP -#: ../dgit.1:1338 +#: ../dgit.1:1389 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.rewrite-map-enable>" msgstr "" #. type: TP -#: ../dgit.1:1340 +#: ../dgit.1:1391 #, 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:1342 +#: ../dgit.1:1393 #, no-wrap msgid "B<dgit.default.old-dsc-distro>" msgstr "" #. type: TP -#: ../dgit.1:1344 +#: ../dgit.1:1395 #, no-wrap msgid "B<dgit.dsc-url-proto-ok.>I<protocol>" msgstr "" #. type: TP -#: ../dgit.1:1346 +#: ../dgit.1:1397 #, no-wrap msgid "B<dgit.dsc-url-proto-ok.bad-syntax>" msgstr "" #. type: TP -#: ../dgit.1:1348 +#: ../dgit.1:1399 #, no-wrap msgid "B<dgit.default.dsc-url-proto-ok>" msgstr "" #. type: TP -#: ../dgit.1:1350 +#: ../dgit.1:1401 #, no-wrap msgid "B<dgit.vcs-git.suites> I<suite>[B<;>...]" msgstr "" #. type: SH -#: ../dgit.1:1352 +#: ../dgit.1:1403 #, no-wrap msgid "ENVIRONMENT VARIABLES" msgstr "" #. type: TP -#: ../dgit.1:1353 +#: ../dgit.1:1404 #, no-wrap msgid "B<DGIT_SSH>, B<GIT_SSH>" msgstr "" #. type: Plain text -#: ../dgit.1:1362 +#: ../dgit.1:1413 msgid "" "specify an alternative default program (and perhaps arguments) to use " "instead of ssh. DGIT_SSH is consulted first and may contain arguments; if " @@ -2556,40 +2618,40 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1362 +#: ../dgit.1:1413 #, no-wrap msgid "B<DEBEMAIL>, B<DEBFULLNAME>" msgstr "" #. type: Plain text -#: ../dgit.1:1366 +#: ../dgit.1:1417 msgid "" "Default git user.email and user.name for new trees. See B<dgit setup-new-" "tree>." msgstr "" #. type: TP -#: ../dgit.1:1366 +#: ../dgit.1:1417 #, no-wrap msgid "B<gpg>, B<dpkg->..., B<debsign>, B<git>, B<curl>, B<dput>, B<LWP::UserAgent>" msgstr "" #. type: Plain text -#: ../dgit.1:1371 +#: ../dgit.1:1422 msgid "" "and other subprograms and modules used by dgit are affected by various " -"environment variables. Consult the documentaton for those programs for " +"environment variables. Consult the documentation for those programs for " "details." msgstr "" #. type: SH -#: ../dgit.1:1371 +#: ../dgit.1:1422 #, no-wrap msgid "BUGS" msgstr "" #. type: Plain text -#: ../dgit.1:1378 +#: ../dgit.1:1429 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 " @@ -2597,7 +2659,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1384 +#: ../dgit.1:1435 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 " @@ -2605,7 +2667,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1389 +#: ../dgit.1:1440 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 " @@ -2614,7 +2676,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1394 +#: ../dgit.1:1445 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-" @@ -2622,24 +2684,24 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit.1:1394 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit.1:1445 ../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:491 ../dgit-maint-gbp.7.pod:136 #: ../dgit-maint-debrebase.7.pod:722 ../dgit-downstream-dsc.7.pod:352 -#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:601 +#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:598 #: ../git-debrebase.5.pod:678 #, no-wrap msgid "SEE ALSO" msgstr "" #. type: Plain text -#: ../dgit.1:1403 +#: ../dgit.1:1454 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:1404 +#: ../dgit.1:1455 msgid "https://browse.dgit.debian.org/" msgstr "" |