diff options
Diffstat (limited to 'po4a/dgit_1.pot')
-rw-r--r-- | po4a/dgit_1.pot | 659 |
1 files changed, 388 insertions, 271 deletions
diff --git a/po4a/dgit_1.pot b/po4a/dgit_1.pot index 052904f..2e5c389 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-03-01 16:59+0000\n" +"POT-Creation-Date: 2019-07-21 01:37+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" @@ -33,7 +33,8 @@ msgstr "" #: ../dgit-maint-native.7.pod:1 ../dgit-maint-merge.7.pod:1 #: ../dgit-maint-gbp.7.pod:1 ../dgit-maint-debrebase.7.pod:1 #: ../dgit-downstream-dsc.7.pod:1 ../dgit-sponsorship.7.pod:1 -#: ../git-debrebase.1.pod:1 ../git-debrebase.5.pod:1 +#: ../dgit-maint-bpo.7.pod:1 ../git-debrebase.1.pod:1 ../git-debrebase.5.pod:1 +#: ../git-debpush.1.pod:1 #, no-wrap msgid "NAME" msgstr "" @@ -43,8 +44,8 @@ msgstr "" msgid "dgit - git integration with the Debian archive" msgstr "" -#. type: SH -#: ../dgit.1:6 +#. type: =head1 +#: ../dgit.1:6 ../git-debpush.1.pod:5 #, no-wrap msgid "SYNOPSIS" msgstr "" @@ -89,8 +90,8 @@ msgstr "" msgid "B<dgit> [I<dgit-opts>] I<action> ..." msgstr "" -#. type: SH -#: ../dgit.1:33 +#. type: =head1 +#: ../dgit.1:33 ../git-debpush.1.pod:9 #, no-wrap msgid "DESCRIPTION" msgstr "" @@ -417,7 +418,7 @@ msgid "B<dgit help>" msgstr "" #. type: Plain text -#: ../dgit.1:185 ../dgit.1:1192 +#: ../dgit.1:185 ../dgit.1:1269 msgid "Print a usage summary." msgstr "" @@ -594,7 +595,7 @@ msgid "" msgstr "" #. type: =item -#: ../dgit.1:286 ../dgit-maint-merge.7.pod:446 +#: ../dgit.1:286 ../dgit-maint-merge.7.pod:476 #, no-wrap msgid "1." msgstr "" @@ -606,7 +607,7 @@ msgid "Clone on build host (dgit clone)" msgstr "" #. type: =item -#: ../dgit.1:287 ../dgit-maint-merge.7.pod:450 +#: ../dgit.1:287 ../dgit-maint-merge.7.pod:480 #, no-wrap msgid "2." msgstr "" @@ -618,7 +619,7 @@ msgid "Edit code on build host (edit, git commit)" msgstr "" #. type: =item -#: ../dgit.1:288 ../dgit-maint-merge.7.pod:455 +#: ../dgit.1:288 ../dgit-maint-merge.7.pod:485 #, no-wrap msgid "3." msgstr "" @@ -1228,25 +1229,36 @@ msgid "" "won't make broken pushes.)" msgstr "" +#. type: Plain text +#: ../dgit.1:657 +msgid "" +"Note that this does B<not> prevent dgit from cleaning your tree, so if the " +"changes in your working tree are in the form of untracked files, those might " +"still be deleted, especially with --clean=git. If you want to include " +"untracked files in the build, you can use --clean=none or --clean=dpkg-" +"source[-d] in addition to --include-dirty. Note that this combination can " +"fail if the untracked files are under I<debian/patches/>." +msgstr "" + #. type: TP -#: ../dgit.1:645 +#: ../dgit.1:657 #, no-wrap msgid "B<--ignore-dirty>" msgstr "" #. type: Plain text -#: ../dgit.1:648 +#: ../dgit.1:660 msgid "Deprecated alias for --include-dirty." msgstr "" #. type: TP -#: ../dgit.1:648 +#: ../dgit.1:660 #, no-wrap msgid "B<--overwrite>[=I<previous-version>]" msgstr "" #. type: Plain text -#: ../dgit.1:659 +#: ../dgit.1:671 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-" @@ -1255,14 +1267,14 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:666 +#: ../dgit.1:678 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:670 +#: ../dgit.1:682 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 " @@ -1270,14 +1282,14 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:676 +#: ../dgit.1:688 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:690 +#: ../dgit.1:702 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 " @@ -1288,7 +1300,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:696 +#: ../dgit.1:708 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 " @@ -1297,26 +1309,26 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:701 +#: ../dgit.1:713 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 " -"dgit view.)" +"(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 " +"appear only in the dgit view.)" msgstr "" #. type: TP -#: ../dgit.1:701 +#: ../dgit.1:713 #, no-wrap msgid "B<--delayed>=I<days>" msgstr "" #. type: Plain text -#: ../dgit.1:704 +#: ../dgit.1:716 msgid "Upload to a DELAYED queue." msgstr "" #. type: Plain text -#: ../dgit.1:714 +#: ../dgit.1:726 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 " @@ -1326,27 +1338,27 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:719 +#: ../dgit.1:731 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:719 +#: ../dgit.1:731 #, no-wrap msgid "B<--no-chase-dsc-distro>" msgstr "" #. type: Plain text -#: ../dgit.1:725 +#: ../dgit.1:737 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:735 +#: ../dgit.1:747 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 " @@ -1355,7 +1367,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:743 +#: ../dgit.1:755 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 " @@ -1364,48 +1376,48 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:743 +#: ../dgit.1:755 #, no-wrap msgid "B<--save-dgit-view=>I<branch>|I<ref>" msgstr "" #. type: Plain text -#: ../dgit.1:753 +#: ../dgit.1:765 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 " -"HEAD, the dgit view will be left in I<ref>. The specified ref is " -"unconditionally overwritten, so don't specify a branch you want to keep." +"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 " +"view will be left in I<ref>. The specified ref is unconditionally " +"overwritten, so don't specify a branch you want to keep." msgstr "" #. type: Plain text -#: ../dgit.1:760 +#: ../dgit.1:769 msgid "" "This option is effective only with the following operations: quilt-fixup; " -"push; all builds. And it is only effective with --[quilt=]gbp, --" -"[quilt=]dpm, --quilt=unpatched." +"push; all builds. And it is only effective when split view is actually in " +"operation." msgstr "" #. type: Plain text -#: ../dgit.1:764 +#: ../dgit.1:773 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:768 +#: ../dgit.1:777 msgid "B<--dgit-view-save> is a deprecated alias for --save-dgit-view." msgstr "" #. type: TP -#: ../dgit.1:768 +#: ../dgit.1:777 #, no-wrap msgid "B<--deliberately->I<something>" msgstr "" #. type: Plain text -#: ../dgit.1:782 +#: ../dgit.1:791 msgid "" "Declare that you are deliberately doing I<something>. This can be used to " "override safety catches, including safety catches which relate to distro-" @@ -1417,13 +1429,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:782 +#: ../dgit.1:791 #, no-wrap msgid "B<--deliberately-not-fast-forward>" msgstr "" #. type: Plain text -#: ../dgit.1:788 +#: ../dgit.1:797 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 " @@ -1432,23 +1444,23 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:799 +#: ../dgit.1:808 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 --" -"overwrite (which creates a suitable pseudomerge) and --deliberately-not-" -"fast-forward (which suppresses the pseudomerge and the fast forward checks) " -"should be needed; --overwrite is usually better." +"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 " +"of --overwrite (which creates a suitable pseudomerge) and --deliberately-" +"not-fast-forward (which suppresses the pseudomerge and the fast forward " +"checks) should be needed; --overwrite is usually better." msgstr "" #. type: TP -#: ../dgit.1:799 +#: ../dgit.1:808 #, no-wrap msgid "B<--deliberately-include-questionable-history>" msgstr "" #. type: Plain text -#: ../dgit.1:808 +#: ../dgit.1:817 msgid "" "Declare that you are deliberately including, in the git history of your " "current push, history which contains a previously-submitted version of this " @@ -1460,27 +1472,27 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:808 +#: ../dgit.1:817 #, no-wrap msgid "B<--deliberately-fresh-repo>" msgstr "" #. type: Plain text -#: ../dgit.1:813 +#: ../dgit.1:822 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 " "server will do this automatically when necessary." msgstr "" -#. type: TP -#: ../dgit.1:813 +#. type: =item +#: ../dgit.1:822 ../git-debpush.1.pod:112 #, no-wrap msgid "B<--quilt=linear>" msgstr "" #. type: Plain text -#: ../dgit.1:820 +#: ../dgit.1:829 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 " @@ -1488,36 +1500,36 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:825 +#: ../dgit.1:834 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:825 +#. type: =item +#: ../dgit.1:834 ../git-debpush.1.pod:124 #, no-wrap msgid "B<--quilt=auto>" msgstr "" #. type: Plain text -#: ../dgit.1:834 +#: ../dgit.1:843 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 " +"linear patch stack (as with --quilt=linear) but if that doesn't seem " "possible, try to generate a single squashed patch for all the changes made " "in git (as with --quilt=smash). This is not a good idea for an NMU in " "Debian." msgstr "" -#. type: TP -#: ../dgit.1:834 +#. type: =item +#: ../dgit.1:843 ../git-debpush.1.pod:118 #, no-wrap msgid "B<--quilt=smash>" msgstr "" #. type: Plain text -#: ../dgit.1:839 +#: ../dgit.1:848 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 " @@ -1525,7 +1537,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:845 +#: ../dgit.1:854 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 " @@ -1533,14 +1545,14 @@ msgid "" "remain true.)" msgstr "" -#. type: TP -#: ../dgit.1:845 +#. type: =item +#: ../dgit.1:854 ../git-debpush.1.pod:129 #, no-wrap msgid "B<--quilt=nofix>" msgstr "" #. type: Plain text -#: ../dgit.1:853 +#: ../dgit.1:862 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 " @@ -1549,13 +1561,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:853 +#: ../dgit.1:862 #, no-wrap msgid "B<--quilt=nocheck> | B<--no-quilt-fixup>" msgstr "" #. type: Plain text -#: ../dgit.1:858 +#: ../dgit.1:867 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 " @@ -1563,20 +1575,27 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:858 +#: ../dgit.1:867 #, no-wrap -msgid "B<-->[B<quilt=>]B<gbp> | B<-->[B<quilt=>]B<dpm> | B<--quilt=unapplied>" +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:865 +#: ../dgit.1:874 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:873 +#: ../dgit.1:878 +msgid "" +"These quilt modes are known as B<splitting quilt modes>. See --split-view, " +"below." +msgstr "" + +#. type: Plain text +#: ../dgit.1:886 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 " @@ -1585,7 +1604,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:881 +#: ../dgit.1:894 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 " @@ -1593,7 +1612,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:886 +#: ../dgit.1:899 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 " @@ -1601,20 +1620,44 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:904 +#: ../dgit.1:913 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 " -"the right form. dgit push will push the dgit-compatible form (the B<dgit " -"view>) to the dgit git server. The dgit view will be visible to you in the " -"dgit remote tracking branches, but your own branch will not be modified. " -"dgit push will create a tag B<debian/>I<version> for the maintainer view, " -"and the dgit tag B<archive/debian/>I<version> for the dgit view. dgit quilt-" -"fixup will merely do some checks, and cache the maintainer view." +"B<--quilt=baredebian> (or its alias B<--quilt=baredebian+git>) specifies " +"that your HEAD contains only a debian/ directory, with any changes to " +"upstream files represented as patches in debian/patches. The upstream " +"source must be available in git, by default, in a suitably named git tag; " +"see --upstream-commitish. In this mode, dgit cannot check that all edited " +"upstream files are properly represented as patches: dgit relies on debian/" +"patches being correct." msgstr "" #. type: Plain text -#: ../dgit.1:913 +#: ../dgit.1:924 +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, " +"dgit will import your orig tarballs' contents into git. In this mode, dgit " +"cannot check that the upstream parts of your upload correspond to what you " +"intend: dgit relies on the right orig tarball(s) existing, and debian/" +"patches being correct." +msgstr "" + +#. type: Plain text +#: ../dgit.1:942 +msgid "" +"With --quilt=gbp|dpm|unapplied|baredebian*, dgit push (or precursors like " +"quilt-fixup and build) will automatically generate a conversion of your git " +"branch into the right form. dgit push will push the dgit-compatible form " +"(the B<dgit view>) to the dgit git server. The dgit view will be visible " +"to you in the dgit remote tracking branches, but your own branch will not be " +"modified. dgit push will create a tag B<debian/>I<version> for the " +"maintainer view, and the dgit tag B<archive/debian/>I<version> for the dgit " +"view. dgit quilt-fixup will merely do some checks, and cache the maintainer " +"view." +msgstr "" + +#. type: Plain text +#: ../dgit.1:951 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 " @@ -1626,13 +1669,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:913 +#: ../dgit.1:951 #, no-wrap msgid "B<-d>I<distro> | B<--distro=>I<distro>" msgstr "" #. type: Plain text -#: ../dgit.1:922 +#: ../dgit.1:960 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-" @@ -1642,7 +1685,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:928 +#: ../dgit.1:966 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 " @@ -1651,7 +1694,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:933 +#: ../dgit.1:971 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 " @@ -1659,13 +1702,70 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:933 +#: ../dgit.1:971 +#, no-wrap +msgid "B<--split-view=auto>|B<always>|B<never>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:976 +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:984 +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 " +"pseudomerges, which bring into the git history previous uploads made with " +"dgit push, and any commits in debian/patches required to make a correct `3.0 " +"(quilt)' source package." +msgstr "" + +#. type: Plain text +#: ../dgit.1:990 +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: " +"--[quilt=]gbp, dpm, unpatched or baredebian*." +msgstr "" + +#. type: Plain text +#: ../dgit.1:993 +msgid "" +"B<always> splits the view regardless of the source format and the quilt mode." +msgstr "" + +#. type: Plain text +#: ../dgit.1:996 +msgid "B<never> will cause dgit to fail if split view is needed." +msgstr "" + +#. type: Plain text +#: ../dgit.1:1004 +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/" +">I<suite> and B<archive/>I<distro>B</>I<version>." +msgstr "" + +#. type: Plain text +#: ../dgit.1:1007 +msgid "" +"Note that split view does not affect dgit fetch, and is not compatible with " +"dgit pull." +msgstr "" + +#. type: TP +#: ../dgit.1:1007 #, no-wrap msgid "B<-C>I<changesfile>" msgstr "" #. type: Plain text -#: ../dgit.1:938 +#: ../dgit.1:1012 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 " @@ -1673,7 +1773,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:947 +#: ../dgit.1:1021 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 " @@ -1681,13 +1781,28 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:947 +#: ../dgit.1:1021 +#, no-wrap +msgid "B<--upstream-commitish=>I<upstream>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:1029 +msgid "" +"For use with --quilt=baredebian only. Specifies the commit containing the " +"upstream source. This commit must be identical to your .orig tarball. The " +"default is to look for one of the git tags I<U>B< v>I<U>B< upstream/>I<U> " +"(in that order), where U is the upstream version." +msgstr "" + +#. type: TP +#: ../dgit.1:1029 #, no-wrap msgid "B<--rm-old-changes>" msgstr "" #. type: Plain text -#: ../dgit.1:959 +#: ../dgit.1:1041 msgid "" "When doing a build, delete any changes files matching " "I<package>B<_>I<version>B<_*.changes> before starting. This ensures that " @@ -1699,32 +1814,32 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:962 +#: ../dgit.1:1044 msgid "" "Note that B<dgit push-source> will always find the right .changes, " "regardless of this option." msgstr "" #. type: TP -#: ../dgit.1:962 +#: ../dgit.1:1044 #, no-wrap msgid "B<--build-products-dir=>I<directory>" msgstr "" #. type: Plain text -#: ../dgit.1:966 +#: ../dgit.1:1048 msgid "" "Specifies where to find and create tarballs, binary packages, source " "packages, .changes files, and so on." msgstr "" #. type: Plain text -#: ../dgit.1:969 +#: ../dgit.1:1051 msgid "By default, dgit uses the parent directory (B<..>)." msgstr "" #. type: Plain text -#: ../dgit.1:978 +#: ../dgit.1:1060 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-" @@ -1733,90 +1848,85 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:978 +#: ../dgit.1:1060 #, no-wrap msgid "B<--no-rm-on-error>" msgstr "" #. type: Plain text -#: ../dgit.1:981 +#: ../dgit.1:1063 msgid "Do not delete the destination directory if clone fails." msgstr "" #. type: TP -#: ../dgit.1:981 +#: ../dgit.1:1063 #, no-wrap msgid "B<--dep14tag>" msgstr "" #. type: Plain text -#: ../dgit.1:988 +#: ../dgit.1:1070 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." +"B<archive/debian/>I<version>). This is the default." msgstr "" #. type: TP -#: ../dgit.1:988 +#: ../dgit.1:1070 #, no-wrap msgid "B<--no-dep14tag>" msgstr "" #. type: Plain text -#: ../dgit.1:994 -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 " -"DEP-14 name. This option does not prevent that.)" +#: ../dgit.1:1073 +msgid "Do not generate a DEP-14 tag, except when split view is in operation." msgstr "" #. type: TP -#: ../dgit.1:994 +#: ../dgit.1:1073 #, no-wrap -msgid "B<--dep14tag-always>" +msgid "B<--always-dep14tag>" msgstr "" #. type: Plain text -#: ../dgit.1:999 -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." +#: ../dgit.1:1076 +msgid "Obsolete alias for --dep14tag, retained for compatibility." msgstr "" #. type: TP -#: ../dgit.1:999 +#: ../dgit.1:1076 #, no-wrap msgid "B<-D>" msgstr "" #. type: Plain text -#: ../dgit.1:1003 +#: ../dgit.1:1080 msgid "" "Prints debugging information to stderr. Repeating the option produces more " "output (currently, up to -DDDD is meaningfully different)." msgstr "" #. type: TP -#: ../dgit.1:1003 +#: ../dgit.1:1080 #, no-wrap msgid "B<-c>I<name>B<=>I<value>" msgstr "" #. type: Plain text -#: ../dgit.1:1007 +#: ../dgit.1:1084 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:1007 +#: ../dgit.1:1084 #, no-wrap msgid "B<-v>I<version>|B<_> | B<--since-version=>versionI<|>B<_>" msgstr "" #. type: Plain text -#: ../dgit.1:1016 +#: ../dgit.1:1093 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 " @@ -1826,7 +1936,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1022 +#: ../dgit.1:1099 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 " @@ -1834,30 +1944,30 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1022 +#: ../dgit.1:1099 #, no-wrap msgid "B<-m>I<maintaineraddress>" msgstr "" #. type: Plain text -#: ../dgit.1:1025 +#: ../dgit.1:1102 msgid "Passed to dpkg-genchanges (eventually)." msgstr "" #. type: TP -#: ../dgit.1:1025 +#: ../dgit.1:1102 #, no-wrap msgid "B<--ch:>I<option>" msgstr "" #. type: Plain text -#: ../dgit.1:1029 +#: ../dgit.1:1106 msgid "" "Specifies a single additional option to pass, eventually, to dpkg-genchanges." msgstr "" #. type: Plain text -#: ../dgit.1:1036 +#: ../dgit.1:1113 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 " @@ -1865,18 +1975,18 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1038 +#: ../dgit.1:1115 msgid "For other options the caveat below applies." msgstr "" #. type: TP -#: ../dgit.1:1038 +#: ../dgit.1:1115 #, no-wrap msgid "B<--curl:>I<option> | B<--dput:>I<option> |..." msgstr "" #. type: Plain text -#: ../dgit.1:1060 +#: ../dgit.1:1137 msgid "" "Specifies a single additional option to pass to B<curl>, B<dput>, " "B<debsign>, B<dpkg-source>, B<dpkg-buildpackage>, B<dpkg-genchanges>, " @@ -1886,7 +1996,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1068 +#: ../dgit.1:1145 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, " @@ -1895,7 +2005,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1073 +#: ../dgit.1:1150 msgid "" "For dpkg-buildpackage, dpkg-genchanges, mergechanges and sbuild, the option " "applies only when the program is invoked directly by dgit. Usually, for " @@ -1903,7 +2013,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1077 +#: ../dgit.1:1154 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 " @@ -1911,39 +2021,39 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1079 +#: ../dgit.1:1156 msgid "See notes below regarding ssh and dgit." msgstr "" #. type: Plain text -#: ../dgit.1:1087 +#: ../dgit.1:1164 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:1087 +#: ../dgit.1:1164 #, no-wrap msgid "B<--curl!:>I<option> | B<--dput!:>I<option> |..." msgstr "" #. type: Plain text -#: ../dgit.1:1093 +#: ../dgit.1:1170 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:1098 +#: ../dgit.1:1175 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:1105 +#: ../dgit.1:1182 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 " @@ -1951,13 +2061,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1105 +#: ../dgit.1:1182 #, no-wrap msgid "B<--curl=>I<program> | B<--dput=>I<program> |..." msgstr "" #. type: Plain text -#: ../dgit.1:1128 +#: ../dgit.1:1205 msgid "" "Specifies alternative programs to use instead of B<curl>, B<dput>, " "B<debsign>, B<dpkg-source>, B<dpkg-buildpackage>, B<dpkg-genchanges>, " @@ -1967,14 +2077,14 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1136 +#: ../dgit.1:1213 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:1143 +#: ../dgit.1:1220 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 " @@ -1983,7 +2093,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1154 +#: ../dgit.1:1231 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 " @@ -1993,7 +2103,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1162 +#: ../dgit.1:1239 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 " @@ -2001,7 +2111,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1179 +#: ../dgit.1:1256 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 " @@ -2013,13 +2123,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1179 +#: ../dgit.1:1256 #, no-wrap msgid "B<--existing-package=>I<package>" msgstr "" #. type: Plain text -#: ../dgit.1:1189 +#: ../dgit.1:1266 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 " @@ -2030,19 +2140,19 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1189 +#: ../dgit.1:1266 #, no-wrap msgid "B<-h>|B<--help>" msgstr "" #. type: TP -#: ../dgit.1:1192 +#: ../dgit.1:1269 #, no-wrap msgid "B<--initiator-tempdir=>I<directory>" msgstr "" #. type: Plain text -#: ../dgit.1:1201 +#: ../dgit.1:1278 msgid "" "dgit rpush uses a temporary directory on the invoking (signing) host. This " "option causes dgit to use I<directory> instead. Furthermore, the specified " @@ -2052,13 +2162,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1201 +#: ../dgit.1:1278 #, no-wrap msgid "B<--force->I<something>" msgstr "" #. type: Plain text -#: ../dgit.1:1209 +#: ../dgit.1:1286 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 " @@ -2067,13 +2177,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1209 +#: ../dgit.1:1286 #, no-wrap msgid "B<--force-import-dsc-with-dgit-field>" msgstr "" #. type: Plain text -#: ../dgit.1:1216 +#: ../dgit.1:1293 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 " @@ -2081,26 +2191,26 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1216 +#: ../dgit.1:1293 #, no-wrap msgid "B<--force-uploading-binaries>" msgstr "" #. type: Plain text -#: ../dgit.1:1221 +#: ../dgit.1:1298 msgid "" "Carry on and upload binaries even though dgit thinks your distro does not " "permit that." msgstr "" #. type: TP -#: ../dgit.1:1221 +#: ../dgit.1:1298 #, no-wrap msgid "B<--force-uploading-source-only>" msgstr "" #. type: Plain text -#: ../dgit.1:1227 +#: ../dgit.1:1304 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 " @@ -2108,13 +2218,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1227 +#: ../dgit.1:1304 #, no-wrap msgid "B<--force-unrepresentable>" msgstr "" #. type: Plain text -#: ../dgit.1:1234 +#: ../dgit.1:1311 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 " @@ -2122,65 +2232,65 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1234 +#: ../dgit.1:1311 #, no-wrap msgid "B<--force-changes-origs-exactly>" msgstr "" #. type: Plain text -#: ../dgit.1:1239 +#: ../dgit.1:1316 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:1239 +#: ../dgit.1:1316 #, no-wrap msgid "B<--force-unsupported-source-format>" msgstr "" #. type: Plain text -#: ../dgit.1:1243 +#: ../dgit.1:1320 msgid "" "Carry on despite dgit not understanding your source package format. dgit " "will probably mishandle it." msgstr "" #. type: TP -#: ../dgit.1:1243 +#: ../dgit.1:1320 #, no-wrap msgid "B<--force-dsc-changes-mismatch>" msgstr "" #. type: Plain text -#: ../dgit.1:1247 +#: ../dgit.1:1324 msgid "" "Do not check whether .dsc and .changes match. The archive will probably " "reject your upload." msgstr "" #. type: TP -#: ../dgit.1:1247 +#: ../dgit.1:1324 #, no-wrap msgid "B<--force-import-gitapply-absurd> | B<--force-import-gitapply-no-absurd>" msgstr "" #. type: Plain text -#: ../dgit.1:1253 +#: ../dgit.1:1330 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:1253 ../dgit-downstream-dsc.7.pod:150 +#: ../dgit.1:1330 ../dgit-downstream-dsc.7.pod:150 #, no-wrap msgid "CONFIGURATION" msgstr "" #. type: Plain text -#: ../dgit.1:1259 +#: ../dgit.1:1336 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<-" @@ -2188,31 +2298,31 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1261 +#: ../dgit.1:1338 msgid "Settings likely to be useful for an end user include:" msgstr "" #. type: TP -#: ../dgit.1:1261 +#: ../dgit.1:1338 #, no-wrap msgid "B<dgit.default.build-products-dir>" msgstr "" #. type: Plain text -#: ../dgit.1:1267 +#: ../dgit.1:1344 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:1267 ../dgit-downstream-dsc.7.pod:286 +#: ../dgit.1:1344 ../dgit-downstream-dsc.7.pod:286 #, no-wrap msgid "B<dgit-suite.>I<suite>B<.distro> I<distro>" msgstr "" #. type: Plain text -#: ../dgit.1:1272 +#: ../dgit.1:1349 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 " @@ -2220,66 +2330,66 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1275 +#: ../dgit.1:1352 msgid "I<suite> may be a glob pattern." msgstr "" #. type: TP -#: ../dgit.1:1275 +#: ../dgit.1:1352 #, no-wrap msgid "B<dgit.default.distro>I< distro>" msgstr "" #. type: Plain text -#: ../dgit.1:1278 +#: ../dgit.1:1355 msgid "The default distro for an unknown suite." msgstr "" #. type: TP -#: ../dgit.1:1278 +#: ../dgit.1:1355 #, no-wrap msgid "B<dgit.default.default-suite>I< suite>" msgstr "" #. type: Plain text -#: ../dgit.1:1281 +#: ../dgit.1:1358 msgid "The default suite (eg for clone)." msgstr "" #. type: TP -#: ../dgit.1:1281 +#: ../dgit.1:1358 #, no-wrap msgid "B<dgit.default.>*" msgstr "" #. type: Plain text -#: ../dgit.1:1286 +#: ../dgit.1:1363 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:1286 +#: ../dgit.1:1363 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.clean-mode>" msgstr "" #. type: Plain text -#: ../dgit.1:1290 +#: ../dgit.1:1367 msgid "" "One of the values for the command line --clean= option; used if --clean is " "not specified." msgstr "" #. type: TP -#: ../dgit.1:1290 +#: ../dgit.1:1367 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.clean-mode-newer>" msgstr "" #. type: Plain text -#: ../dgit.1:1296 +#: ../dgit.1:1373 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 " @@ -2287,39 +2397,45 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1296 +#: ../dgit.1:1373 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.quilt-mode>" msgstr "" #. type: Plain text -#: ../dgit.1:1300 +#: ../dgit.1:1377 msgid "" "One of the values for the command line --quilt= option; used if --quilt is " "not specified." msgstr "" #. type: TP -#: ../dgit.1:1300 +#: ../dgit.1:1377 +#, no-wrap +msgid "B<dgit-distro.>I<distro>B<.split-view>" +msgstr "" + +#. type: TP +#: ../dgit.1:1379 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.rm-old-changes>" msgstr "" #. type: Plain text -#: ../dgit.1:1304 +#: ../dgit.1:1383 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:1304 +#: ../dgit.1:1383 #, 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:1311 +#: ../dgit.1:1390 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, " @@ -2328,52 +2444,52 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1311 +#: ../dgit.1:1390 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.keyid>" msgstr "" #. type: Plain text -#: ../dgit.1:1315 +#: ../dgit.1:1394 msgid "See also B<-k>." msgstr "" #. type: TP -#: ../dgit.1:1315 +#: ../dgit.1:1394 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.mirror>I< url>" msgstr "" #. type: TP -#: ../dgit.1:1317 +#: ../dgit.1:1396 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.username>" msgstr "" #. type: Plain text -#: ../dgit.1:1320 +#: ../dgit.1:1399 msgid "Not relevant for Debian." msgstr "" #. type: =item -#: ../dgit.1:1320 ../dgit-downstream-dsc.7.pod:242 +#: ../dgit.1:1399 ../dgit-downstream-dsc.7.pod:242 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.upload-host>" msgstr "" #. type: Plain text -#: ../dgit.1:1323 +#: ../dgit.1:1402 msgid "Might be useful if you have an intermediate queue server." msgstr "" #. type: TP -#: ../dgit.1:1323 +#: ../dgit.1:1402 #, 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:1328 +#: ../dgit.1:1407 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, " @@ -2381,26 +2497,26 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1328 +#: ../dgit.1:1407 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.setup-useremail>" msgstr "" #. type: Plain text -#: ../dgit.1:1332 +#: ../dgit.1:1411 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:1332 +#: ../dgit.1:1411 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.setup-mergechangelogs>" msgstr "" #. type: Plain text -#: ../dgit.1:1337 +#: ../dgit.1:1416 msgid "" "Whether to set up a merge driver which uses dpkg-mergechangelogs for debian/" "changelog. True by default. Ignored for dgit setup-mergechangelogs, which " @@ -2408,13 +2524,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1337 +#: ../dgit.1:1416 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.setup-gitattributes>" msgstr "" #. type: Plain text -#: ../dgit.1:1343 +#: ../dgit.1:1422 msgid "" "Whether to configure .git/info/attributes to suppress checkin/checkout file " "content transformations in new git trees. True by default. Ignored for " @@ -2422,24 +2538,24 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1343 +#: ../dgit.1:1422 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.cmd->I<cmd>" msgstr "" #. type: Plain text -#: ../dgit.1:1349 +#: ../dgit.1:1428 msgid "Program to use instead of I<cmd>. Works like B<-->I<cmd>B<=>... ." msgstr "" #. type: TP -#: ../dgit.1:1349 +#: ../dgit.1:1428 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.opts->I<cmd>" msgstr "" #. type: Plain text -#: ../dgit.1:1361 +#: ../dgit.1:1440 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 --" @@ -2449,13 +2565,13 @@ msgid "" msgstr "" #. type: SH -#: ../dgit.1:1361 +#: ../dgit.1:1440 #, no-wrap msgid "ACCESS CONFIGURATION" msgstr "" #. type: Plain text -#: ../dgit.1:1366 +#: ../dgit.1:1445 msgid "" "There are many other settings which specify how a particular distro's " "services (archive and git) are provided. These should not normally be " @@ -2464,204 +2580,204 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1366 +#: ../dgit.1:1445 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.nominal-distro>" msgstr "" #. type: Plain text -#: ../dgit.1:1369 +#: ../dgit.1:1448 msgid "Shown in git tags, Dgit fields, and so on." msgstr "" #. type: TP -#: ../dgit.1:1369 +#: ../dgit.1:1448 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.alias-canon>" msgstr "" #. type: Plain text -#: ../dgit.1:1372 +#: ../dgit.1:1451 msgid "Used for all access configuration lookup." msgstr "" #. type: TP -#: ../dgit.1:1372 +#: ../dgit.1:1451 #, no-wrap msgid "B<dgit-distro.>I<distro>B</push.>*" msgstr "" #. type: Plain text -#: ../dgit.1:1378 +#: ../dgit.1:1457 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:1378 +#: ../dgit.1:1457 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-url>" msgstr "" #. type: TP -#: ../dgit.1:1380 +#: ../dgit.1:1459 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-url>[B<-suffix>]" msgstr "" #. type: TP -#: ../dgit.1:1382 +#: ../dgit.1:1461 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-proto>" msgstr "" #. type: TP -#: ../dgit.1:1384 +#: ../dgit.1:1463 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-path>" msgstr "" #. type: TP -#: ../dgit.1:1386 +#: ../dgit.1:1465 #, 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:1388 +#: ../dgit.1:1467 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-check-suffix>" msgstr "" #. type: TP -#: ../dgit.1:1390 +#: ../dgit.1:1469 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.diverts.divert> B<new-distro>|B</>I<distro-suffix>" msgstr "" #. type: TP -#: ../dgit.1:1392 +#: ../dgit.1:1471 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-create>I< >B<ssh-cmd>I<|>B<true>" msgstr "" #. type: TP -#: ../dgit.1:1394 +#: ../dgit.1:1473 #, 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>" +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:1396 +#: ../dgit.1:1475 #, 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:1398 +#: ../dgit.1:1477 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.madison-distro>" msgstr "" #. type: TP -#: ../dgit.1:1400 +#: ../dgit.1:1479 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.archive-query-default-component>" msgstr "" #. type: TP -#: ../dgit.1:1402 +#: ../dgit.1:1481 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.dgit-tag-format>" msgstr "" #. type: TP -#: ../dgit.1:1404 +#: ../dgit.1:1483 #, no-wrap -msgid "B<dgit-distro.>I<distro>B<.dep14tag> B<want>|B<no>|B<always>" +msgid "B<dgit-distro.>I<distro>B<.dep14tag> B<want>|B<no>[|B<always>]" msgstr "" #. type: TP -#: ../dgit.1:1406 +#: ../dgit.1:1485 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.ssh>" msgstr "" #. type: TP -#: ../dgit.1:1408 +#: ../dgit.1:1487 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.sshpsql-dbname>" msgstr "" #. type: TP -#: ../dgit.1:1410 +#: ../dgit.1:1489 #, 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:1412 +#: ../dgit.1:1491 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.backports-quirk>" msgstr "" #. type: TP -#: ../dgit.1:1414 +#: ../dgit.1:1493 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.rewrite-map-enable>" msgstr "" #. type: TP -#: ../dgit.1:1416 +#: ../dgit.1:1495 #, 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:1418 +#: ../dgit.1:1497 #, no-wrap msgid "B<dgit.default.old-dsc-distro>" msgstr "" #. type: TP -#: ../dgit.1:1420 +#: ../dgit.1:1499 #, no-wrap msgid "B<dgit.dsc-url-proto-ok.>I<protocol>" msgstr "" #. type: TP -#: ../dgit.1:1422 +#: ../dgit.1:1501 #, no-wrap msgid "B<dgit.dsc-url-proto-ok.bad-syntax>" msgstr "" #. type: TP -#: ../dgit.1:1424 +#: ../dgit.1:1503 #, no-wrap msgid "B<dgit.default.dsc-url-proto-ok>" msgstr "" #. type: TP -#: ../dgit.1:1426 +#: ../dgit.1:1505 #, no-wrap msgid "B<dgit.vcs-git.suites> I<suite>[B<;>...]" msgstr "" #. type: SH -#: ../dgit.1:1428 +#: ../dgit.1:1507 #, no-wrap msgid "ENVIRONMENT VARIABLES" msgstr "" #. type: TP -#: ../dgit.1:1429 +#: ../dgit.1:1508 #, no-wrap msgid "B<DGIT_SSH>, B<GIT_SSH>" msgstr "" #. type: Plain text -#: ../dgit.1:1438 +#: ../dgit.1:1517 msgid "" "specify an alternative default program (and perhaps arguments) to use " "instead of ssh. DGIT_SSH is consulted first and may contain arguments; if " @@ -2671,26 +2787,26 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1438 +#: ../dgit.1:1517 #, no-wrap msgid "B<DEBEMAIL>, B<DEBFULLNAME>" msgstr "" #. type: Plain text -#: ../dgit.1:1442 +#: ../dgit.1:1521 msgid "" "Default git user.email and user.name for new trees. See B<dgit setup-new-" "tree>." msgstr "" #. type: TP -#: ../dgit.1:1442 +#: ../dgit.1:1521 #, no-wrap msgid "B<gpg>, B<dpkg->..., B<debsign>, B<git>, B<curl>, B<dput>, B<LWP::UserAgent>" msgstr "" #. type: Plain text -#: ../dgit.1:1447 +#: ../dgit.1:1526 msgid "" "and other subprograms and modules used by dgit are affected by various " "environment variables. Consult the documentation for those programs for " @@ -2698,13 +2814,13 @@ msgid "" msgstr "" #. type: SH -#: ../dgit.1:1447 +#: ../dgit.1:1526 #, no-wrap msgid "BUGS" msgstr "" #. type: Plain text -#: ../dgit.1:1454 +#: ../dgit.1:1533 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 " @@ -2712,7 +2828,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1460 +#: ../dgit.1:1539 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 " @@ -2720,7 +2836,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1465 +#: ../dgit.1:1544 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 " @@ -2729,7 +2845,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1470 +#: ../dgit.1:1549 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-" @@ -2737,24 +2853,25 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit.1:1470 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit.1:1549 ../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:747 ../dgit-downstream-dsc.7.pod:352 -#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:619 -#: ../git-debrebase.5.pod:678 +#: ../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-sponsorship.7.pod:321 ../dgit-maint-bpo.7.pod:134 +#: ../git-debrebase.1.pod:619 ../git-debrebase.5.pod:678 +#: ../git-debpush.1.pod:223 #, no-wrap msgid "SEE ALSO" msgstr "" #. type: Plain text -#: ../dgit.1:1479 +#: ../dgit.1:1558 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:1480 +#: ../dgit.1:1559 msgid "https://browse.dgit.debian.org/" msgstr "" |