msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-10-13 20:41+0100\n"
+"POT-Creation-Date: 2019-09-14 20:40+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"
#: ../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 ""
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 ""
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 ""
msgstr ""
#. type: Plain text
-#: ../dgit.1:185 ../dgit.1:1168
+#: ../dgit.1:185 ../dgit.1:1271
msgid "Print a usage summary."
msgstr ""
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 ""
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 ""
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 ""
msgid ""
"Set up the working tree's B<.git/info/attributes> to disable all "
"transforming attributes for all files. This is done by defining a macro "
-"attribute B<dgit-defuse-attrs> and applying it to B<*>. For why, see "
+"attribute, B<dgit-defuse-attrs,> and applying it to B<*>. For why, see "
"B<GITATTRIBUTES> in B<dgit(7)>. Note that only attributes affecting the "
"working tree are suppressed. git-archive may remain exciting."
msgstr ""
"If there is an existing macro attribute line B<[attr]dgit-defuse-attrs> in ."
"git/info/attributes, but it is insufficient, because it was made by an "
"earlier version of dgit and git has since introduced new transforming "
-"attributes, modifies the macro to disable the newer transformations."
+"attributes, this modifies the macro to disable the newer transformations."
msgstr ""
#. type: Plain text
"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 "
-"the existing branch. Otherwise, if branch already exists, dgit will stop "
+"the existing branch. Otherwise, if I<branch> already exists, dgit will stop "
"with an error message."
msgstr ""
msgstr ""
#. type: =head1
-#: ../dgit.1:496 ../git-debrebase.1.pod:441
+#: ../dgit.1:496 ../git-debrebase.1.pod:476
#, no-wrap
msgid "OPTIONS"
msgstr ""
msgstr ""
#. type: Plain text
-#: ../dgit.1:555
+#: ../dgit.1:548
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> "
+"build the source package or binaries from your working tree). Otherwise it "
+"will just check that there are no untracked unignored files. See --"
+"clean=git[-ff],always, below."
+msgstr ""
+
+#. type: TP
+#: ../dgit.1:548
+#, no-wrap
+msgid "B<--clean=git-ff> | B<-wgf>"
+msgstr ""
+
+#. type: Plain text
+#: ../dgit.1:557
+msgid ""
"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:555
+#: ../dgit.1:557
#, no-wrap
-msgid "B<--clean=check> | B<--clean=check,ignores> | B<-wc> | B<-wci>"
+msgid "B<--clean=git>[B<-ff>]B<,always> | B<-wga> | B<-wgfa>"
msgstr ""
#. type: Plain text
#: ../dgit.1:561
msgid ""
+"Like --clean=git, but always does the clean and not just a check, deleting "
+"any untracked un-ignored files."
+msgstr ""
+
+#. type: TP
+#: ../dgit.1:561
+#, no-wrap
+msgid "B<--clean=check> | B<--clean=check,ignores> | B<-wc> | B<-wci>"
+msgstr ""
+
+#. type: Plain text
+#: ../dgit.1:567
+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
+#: ../dgit.1:578
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 "
msgstr ""
#. type: TP
-#: ../dgit.1:572
+#: ../dgit.1:578
#, no-wrap
msgid "B<--clean=none> | B<-wn>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:580
+#: ../dgit.1:586
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 "
msgstr ""
#. type: TP
-#: ../dgit.1:580
+#: ../dgit.1:586
#, no-wrap
msgid "B<--clean=dpkg-source>[B<-d>] | B<-wd> | B<-wdd>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:585
+#: ../dgit.1:591
msgid ""
"Use dpkg-buildpackage to do the clean, so that the source package is cleaned "
"by dpkg-source running the package's clean target. --clean=dpkg-source is "
msgstr ""
#. type: Plain text
-#: ../dgit.1:589
+#: ../dgit.1:595
msgid "Without the extra B<d>, requires the package's build dependencies."
msgstr ""
#. type: Plain text
-#: ../dgit.1:599
+#: ../dgit.1:605
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 "
msgstr ""
#. type: Plain text
-#: ../dgit.1:606
+#: ../dgit.1:612
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 "
msgstr ""
#. type: Plain text
-#: ../dgit.1:616
+#: ../dgit.1:622
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 "
msgstr ""
#. type: TP
-#: ../dgit.1:616
+#: ../dgit.1:622
#, no-wrap
msgid "B<--clean=dpkg-source>[B<-d>]B<,no-check> | B<-wdn> | B<-wddn>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:620
+#: ../dgit.1:626
msgid ""
"Like --clean=dpkg-source, but does not care about untracked un-ignored files."
msgstr ""
#. type: TP
-#: ../dgit.1:620
+#: ../dgit.1:626
#, no-wrap
msgid "B<--clean=dpkg-source>[B<-d>]B<,all-check> | B<-wda> | B<-wdda>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:625
+#: ../dgit.1:631
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
+#: ../dgit.1:631
#, no-wrap
msgid "B<-N> | B<--new>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:631
+#: ../dgit.1:638
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 "
msgstr ""
#. type: TP
-#: ../dgit.1:631
+#: ../dgit.1:638
#, no-wrap
msgid "B<--include-dirty>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:639
+#: ../dgit.1:646
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 "
"won't make broken pushes.)"
msgstr ""
+#. type: Plain text
+#: ../dgit.1:658
+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:639
+#: ../dgit.1:658
#, no-wrap
msgid "B<--ignore-dirty>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:642
+#: ../dgit.1:661
msgid "Deprecated alias for --include-dirty."
msgstr ""
#. type: TP
-#: ../dgit.1:642
+#: ../dgit.1:661
#, no-wrap
msgid "B<--overwrite>[=I<previous-version>]"
msgstr ""
#. type: Plain text
-#: ../dgit.1:653
+#: ../dgit.1:672
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-"
msgstr ""
#. type: Plain text
-#: ../dgit.1:660
+#: ../dgit.1:679
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:664
+#: ../dgit.1:683
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 "
msgstr ""
#. type: Plain text
-#: ../dgit.1:670
+#: ../dgit.1:689
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:684
+#: ../dgit.1:703
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 "
msgstr ""
#. type: Plain text
-#: ../dgit.1:690
+#: ../dgit.1:709
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 "
msgstr ""
#. type: Plain text
-#: ../dgit.1:695
+#: ../dgit.1:714
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:695
+#: ../dgit.1:714
#, no-wrap
msgid "B<--delayed>=I<days>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:698
+#: ../dgit.1:717
msgid "Upload to a DELAYED queue."
msgstr ""
#. type: Plain text
-#: ../dgit.1:708
+#: ../dgit.1:727
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 "
msgstr ""
#. type: Plain text
-#: ../dgit.1:713
+#: ../dgit.1:732
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:713
+#: ../dgit.1:732
#, no-wrap
msgid "B<--no-chase-dsc-distro>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:719
+#: ../dgit.1:738
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:729
+#: ../dgit.1:748
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 "
msgstr ""
#. type: Plain text
-#: ../dgit.1:737
+#: ../dgit.1:756
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 "
msgstr ""
#. type: TP
-#: ../dgit.1:737
+#: ../dgit.1:756
#, no-wrap
msgid "B<--save-dgit-view=>I<branch>|I<ref>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:747
+#: ../dgit.1:766
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:754
+#: ../dgit.1:770
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:758
+#: ../dgit.1:774
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:762
+#: ../dgit.1:778
msgid "B<--dgit-view-save> is a deprecated alias for --save-dgit-view."
msgstr ""
#. type: TP
-#: ../dgit.1:762
+#: ../dgit.1:778
#, no-wrap
msgid "B<--deliberately->I<something>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:776
+#: ../dgit.1:792
msgid ""
"Declare that you are deliberately doing I<something>. This can be used to "
"override safety catches, including safety catches which relate to distro-"
"specific policies. The use of --deliberately is declared and published in "
"the signed tags generated for you by dgit, so that the archive software can "
-"give effect to your intent, and for the benefit humans looking at the "
+"give effect to your intent, and for the benefit of humans looking at the "
"history. The meanings of I<something>s understood in the context of Debian "
"are discussed below:"
msgstr ""
#. type: TP
-#: ../dgit.1:776
+#: ../dgit.1:792
#, no-wrap
msgid "B<--deliberately-not-fast-forward>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:782
+#: ../dgit.1:799
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 "
msgstr ""
#. type: Plain text
-#: ../dgit.1:793
+#: ../dgit.1:810
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:793
+#: ../dgit.1:810
#, no-wrap
msgid "B<--deliberately-include-questionable-history>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:802
+#: ../dgit.1:819
msgid ""
"Declare that you are deliberately including, in the git history of your "
"current push, history which contains a previously-submitted version of this "
msgstr ""
#. type: TP
-#: ../dgit.1:802
+#: ../dgit.1:819
#, no-wrap
msgid "B<--deliberately-fresh-repo>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:807
+#: ../dgit.1:824
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:807
+#. type: =item
+#: ../dgit.1:824 ../git-debpush.1.pod:114
#, no-wrap
msgid "B<--quilt=linear>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:814
+#: ../dgit.1:831
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 "
msgstr ""
#. type: Plain text
-#: ../dgit.1:819
+#: ../dgit.1:836
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:819
+#. type: =item
+#: ../dgit.1:836 ../git-debpush.1.pod:126
#, no-wrap
msgid "B<--quilt=auto>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:828
+#: ../dgit.1:845
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:828
+#. type: =item
+#: ../dgit.1:845 ../git-debpush.1.pod:120
#, no-wrap
msgid "B<--quilt=smash>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:833
+#: ../dgit.1:850
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 "
msgstr ""
#. type: Plain text
-#: ../dgit.1:839
+#: ../dgit.1:856
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 "
"remain true.)"
msgstr ""
-#. type: TP
-#: ../dgit.1:839
+#. type: =item
+#: ../dgit.1:856 ../git-debpush.1.pod:131
#, no-wrap
msgid "B<--quilt=nofix>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:847
+#: ../dgit.1:864
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 "
msgstr ""
#. type: TP
-#: ../dgit.1:847
+#: ../dgit.1:864
#, no-wrap
msgid "B<--quilt=nocheck> | B<--no-quilt-fixup>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:852
+#: ../dgit.1:869
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, "
-"dgit push will fail."
+"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 "
+"push will fail."
msgstr ""
#. type: TP
-#: ../dgit.1:852
+#: ../dgit.1:869
#, 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:859
+#: ../dgit.1:876
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:867
+#: ../dgit.1:880
+msgid ""
+"These quilt modes are known as B<splitting quilt modes>. See --split-view, "
+"below."
+msgstr ""
+
+#. type: Plain text
+#: ../dgit.1:888
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 "
msgstr ""
#. type: Plain text
-#: ../dgit.1:875
+#: ../dgit.1:896
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 "
msgstr ""
#. type: Plain text
-#: ../dgit.1:880
+#: ../dgit.1:901
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 "
msgstr ""
#. type: Plain text
-#: ../dgit.1:898
+#: ../dgit.1:915
+msgid ""
+"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:926
+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:944
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."
+"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:907
+#: ../dgit.1:953
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 "
msgstr ""
#. type: TP
-#: ../dgit.1:907
+#: ../dgit.1:953
#, no-wrap
msgid "B<-d>I<distro> | B<--distro=>I<distro>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:916
+#: ../dgit.1:962
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-"
msgstr ""
#. type: Plain text
-#: ../dgit.1:922
+#: ../dgit.1:968
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 "
msgstr ""
#. type: Plain text
-#: ../dgit.1:927
+#: ../dgit.1:973
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 "
msgstr ""
#. type: TP
-#: ../dgit.1:927
+#: ../dgit.1:973
+#, no-wrap
+msgid "B<--split-view=auto>|B<always>|B<never>"
+msgstr ""
+
+#. type: Plain text
+#: ../dgit.1:978
+msgid ""
+"Controls whether dgit operates a split view, separating your own branch (as "
+"Debian maintainer) from that shown to users of dgit clone and dgit fetch."
+msgstr ""
+
+#. type: Plain text
+#: ../dgit.1:986
+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:992
+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:995
+msgid ""
+"B<always> splits the view regardless of the source format and the quilt mode."
+msgstr ""
+
+#. type: Plain text
+#: ../dgit.1:998
+msgid "B<never> will cause dgit to fail if split view is needed."
+msgstr ""
+
+#. type: Plain text
+#: ../dgit.1:1006
+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:1009
+msgid ""
+"Note that split view does not affect dgit fetch, and is not compatible with "
+"dgit pull."
+msgstr ""
+
+#. type: TP
+#: ../dgit.1:1009
#, no-wrap
msgid "B<-C>I<changesfile>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:932
+#: ../dgit.1:1014
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 "
+"looks for a single .changes file in the parent directory whose filename "
"suggests it is for the right package and version."
msgstr ""
#. type: Plain text
-#: ../dgit.1:941
+#: ../dgit.1:1023
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 "
msgstr ""
#. type: TP
-#: ../dgit.1:941
+#: ../dgit.1:1023
+#, no-wrap
+msgid "B<--upstream-commitish=>I<upstream>"
+msgstr ""
+
+#. type: Plain text
+#: ../dgit.1:1031
+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:1031
#, no-wrap
msgid "B<--rm-old-changes>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:953
+#: ../dgit.1:1043
msgid ""
"When doing a build, delete any changes files matching "
"I<package>B<_>I<version>B<_*.changes> before starting. This ensures that "
msgstr ""
#. type: Plain text
-#: ../dgit.1:956
+#: ../dgit.1:1046
msgid ""
"Note that B<dgit push-source> will always find the right .changes, "
"regardless of this option."
msgstr ""
#. type: TP
-#: ../dgit.1:956
+#: ../dgit.1:1046
#, no-wrap
msgid "B<--build-products-dir=>I<directory>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:960
+#: ../dgit.1:1050
msgid ""
"Specifies where to find and create tarballs, binary packages, source "
"packages, .changes files, and so on."
msgstr ""
#. type: Plain text
-#: ../dgit.1:963
+#: ../dgit.1:1053
msgid "By default, dgit uses the parent directory (B<..>)."
msgstr ""
#. type: Plain text
-#: ../dgit.1:972
+#: ../dgit.1:1062
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-"
msgstr ""
#. type: TP
-#: ../dgit.1:972
+#: ../dgit.1:1062
#, no-wrap
msgid "B<--no-rm-on-error>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:975
+#: ../dgit.1:1065
msgid "Do not delete the destination directory if clone fails."
msgstr ""
#. type: TP
-#: ../dgit.1:975
+#: ../dgit.1:1065
#, no-wrap
msgid "B<--dep14tag>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:982
+#: ../dgit.1:1072
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:982
+#: ../dgit.1:1072
#, no-wrap
msgid "B<--no-dep14tag>"
msgstr ""
#. type: Plain text
-#: ../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 "
-"DEP-14 name. This option does not prevent that.)"
+#: ../dgit.1:1075
+msgid "Do not generate a DEP-14 tag, except when split view is in operation."
msgstr ""
#. type: TP
-#: ../dgit.1:988
+#: ../dgit.1:1075
#, no-wrap
-msgid "B<--dep14tag-always>"
+msgid "B<--always-dep14tag>"
msgstr ""
#. type: Plain text
-#: ../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."
+#: ../dgit.1:1078
+msgid "Obsolete alias for --dep14tag, retained for compatibility."
msgstr ""
#. type: TP
-#: ../dgit.1:993
+#: ../dgit.1:1078
#, no-wrap
msgid "B<-D>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:997
+#: ../dgit.1:1082
msgid ""
"Prints debugging information to stderr. Repeating the option produces more "
"output (currently, up to -DDDD is meaningfully different)."
msgstr ""
#. type: TP
-#: ../dgit.1:997
+#: ../dgit.1:1082
#, no-wrap
msgid "B<-c>I<name>B<=>I<value>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1001
+#: ../dgit.1:1086
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:1001
+#: ../dgit.1:1086
#, no-wrap
msgid "B<-v>I<version>|B<_> | B<--since-version=>versionI<|>B<_>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1010
+#: ../dgit.1:1095
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 "
msgstr ""
#. type: Plain text
-#: ../dgit.1:1016
+#: ../dgit.1:1101
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 "
msgstr ""
#. type: TP
-#: ../dgit.1:1016
+#: ../dgit.1:1101
#, no-wrap
msgid "B<-m>I<maintaineraddress>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1019
+#: ../dgit.1:1104
msgid "Passed to dpkg-genchanges (eventually)."
msgstr ""
#. type: TP
-#: ../dgit.1:1019
+#: ../dgit.1:1104
#, no-wrap
msgid "B<--ch:>I<option>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1023
+#: ../dgit.1:1108
msgid ""
"Specifies a single additional option to pass, eventually, to dpkg-genchanges."
msgstr ""
#. type: Plain text
-#: ../dgit.1:1030
+#: ../dgit.1:1115
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 "
msgstr ""
#. type: Plain text
-#: ../dgit.1:1032
+#: ../dgit.1:1117
msgid "For other options the caveat below applies."
msgstr ""
#. type: TP
-#: ../dgit.1:1032
+#: ../dgit.1:1117
#, no-wrap
msgid "B<--curl:>I<option> | B<--dput:>I<option> |..."
msgstr ""
#. type: Plain text
-#: ../dgit.1:1054
+#: ../dgit.1:1139
msgid ""
"Specifies a single additional option to pass to B<curl>, B<dput>, "
"B<debsign>, B<dpkg-source>, B<dpkg-buildpackage>, B<dpkg-genchanges>, "
msgstr ""
#. type: Plain text
-#: ../dgit.1:1062
+#: ../dgit.1:1147
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, "
msgstr ""
#. type: Plain text
-#: ../dgit.1:1067
+#: ../dgit.1:1152
msgid ""
"For dpkg-buildpackage, dpkg-genchanges, mergechanges and sbuild, the option "
"applies only when the program is invoked directly by dgit. Usually, for "
msgstr ""
#. type: Plain text
-#: ../dgit.1:1071
+#: ../dgit.1:1156
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 "
msgstr ""
#. type: Plain text
-#: ../dgit.1:1073
+#: ../dgit.1:1158
msgid "See notes below regarding ssh and dgit."
msgstr ""
#. type: Plain text
-#: ../dgit.1:1081
+#: ../dgit.1:1166
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:1081
+#: ../dgit.1:1166
+#, no-wrap
+msgid "B<--curl!:>I<option> | B<--dput!:>I<option> |..."
+msgstr ""
+
+#. type: Plain text
+#: ../dgit.1:1172
+msgid ""
+"Specifies an option to remove from the command line for a program called by "
+"dgit, as for B<-->I<program>B<:>I<option> (and the same caveats apply)."
+msgstr ""
+
+#. type: Plain text
+#: ../dgit.1:1177
+msgid ""
+"Any options or arguments exactly identical to I<option> are removed. (It is "
+"not an error if there were none.)"
+msgstr ""
+
+#. type: Plain text
+#: ../dgit.1:1184
+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 "
+"used to override option(s) dynamically decided on by dgit."
+msgstr ""
+
+#. type: TP
+#: ../dgit.1:1184
#, no-wrap
msgid "B<--curl=>I<program> | B<--dput=>I<program> |..."
msgstr ""
#. type: Plain text
-#: ../dgit.1:1104
+#: ../dgit.1:1207
msgid ""
"Specifies alternative programs to use instead of B<curl>, B<dput>, "
"B<debsign>, B<dpkg-source>, B<dpkg-buildpackage>, B<dpkg-genchanges>, "
msgstr ""
#. type: Plain text
-#: ../dgit.1:1112
+#: ../dgit.1:1215
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:1119
+#: ../dgit.1:1222
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 "
msgstr ""
#. type: Plain text
-#: ../dgit.1:1130
+#: ../dgit.1:1233
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 "
msgstr ""
#. type: Plain text
-#: ../dgit.1:1138
+#: ../dgit.1:1241
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 "
msgstr ""
#. type: Plain text
-#: ../dgit.1:1155
+#: ../dgit.1:1258
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 "
msgstr ""
#. type: TP
-#: ../dgit.1:1155
+#: ../dgit.1:1258
#, no-wrap
msgid "B<--existing-package=>I<package>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1165
+#: ../dgit.1:1268
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 "
msgstr ""
#. type: TP
-#: ../dgit.1:1165
+#: ../dgit.1:1268
#, no-wrap
msgid "B<-h>|B<--help>"
msgstr ""
#. type: TP
-#: ../dgit.1:1168
+#: ../dgit.1:1271
#, no-wrap
msgid "B<--initiator-tempdir=>I<directory>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1177
+#: ../dgit.1:1280
msgid ""
"dgit rpush uses a temporary directory on the invoking (signing) host. This "
"option causes dgit to use I<directory> instead. Furthermore, the specified "
msgstr ""
#. type: TP
-#: ../dgit.1:1177
+#: ../dgit.1:1280
#, no-wrap
msgid "B<--force->I<something>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1185
+#: ../dgit.1:1288
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 "
msgstr ""
#. type: TP
-#: ../dgit.1:1185
+#: ../dgit.1:1288
#, no-wrap
msgid "B<--force-import-dsc-with-dgit-field>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1192
+#: ../dgit.1:1295
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 "
msgstr ""
#. type: TP
-#: ../dgit.1:1192
+#: ../dgit.1:1295
+#, no-wrap
+msgid "B<--force-reusing-version>"
+msgstr ""
+
+#. type: Plain text
+#: ../dgit.1:1302
+msgid ""
+"Carry on even though this involves reusing a version number of a previous "
+"push or upload. It is normally best to give different versions different "
+"numbers. Some servers (including, usually, the Debian server) will reject "
+"attempts to reuse or replace already-pushed versions."
+msgstr ""
+
+#. type: TP
+#: ../dgit.1:1302
#, no-wrap
msgid "B<--force-uploading-binaries>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1197
+#: ../dgit.1:1307
msgid ""
"Carry on and upload binaries even though dgit thinks your distro does not "
"permit that."
msgstr ""
#. type: TP
-#: ../dgit.1:1197
+#: ../dgit.1:1307
#, no-wrap
msgid "B<--force-uploading-source-only>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1203
+#: ../dgit.1:1313
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 "
msgstr ""
#. type: TP
-#: ../dgit.1:1203
+#: ../dgit.1:1313
#, no-wrap
msgid "B<--force-unrepresentable>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1210
+#: ../dgit.1:1320
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 "
msgstr ""
#. type: TP
-#: ../dgit.1:1210
+#: ../dgit.1:1320
#, no-wrap
msgid "B<--force-changes-origs-exactly>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1215
+#: ../dgit.1:1325
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:1215
+#: ../dgit.1:1325
#, no-wrap
msgid "B<--force-unsupported-source-format>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1219
+#: ../dgit.1:1329
msgid ""
"Carry on despite dgit not understanding your source package format. dgit "
"will probably mishandle it."
msgstr ""
#. type: TP
-#: ../dgit.1:1219
+#: ../dgit.1:1329
#, no-wrap
msgid "B<--force-dsc-changes-mismatch>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1223
+#: ../dgit.1:1333
msgid ""
"Do not check whether .dsc and .changes match. The archive will probably "
"reject your upload."
msgstr ""
#. type: TP
-#: ../dgit.1:1223
+#: ../dgit.1:1333
#, no-wrap
msgid "B<--force-import-gitapply-absurd> | B<--force-import-gitapply-no-absurd>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1229
+#: ../dgit.1:1339
msgid ""
"Force on or off the use of the absurd git-apply emulation when running gbp "
"pq import when importing a package from a .dsc. See Debian bug #841867."
msgstr ""
+#. type: TP
+#: ../dgit.1:1339
+#, no-wrap
+msgid "B<--for-push>"
+msgstr ""
+
+#. type: Plain text
+#: ../dgit.1:1345
+msgid ""
+"Override the dgit-distro.distro.readonly configuration setting, to specify "
+"that we have read/write access and should use the corresponding git and "
+"achieve access approach even if the operation is a read-only one."
+msgstr ""
+
#. type: =head1
-#: ../dgit.1:1229 ../dgit-downstream-dsc.7.pod:150
+#: ../dgit.1:1345 ../dgit-downstream-dsc.7.pod:150
#, no-wrap
msgid "CONFIGURATION"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1235
+#: ../dgit.1:1351
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<-"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1237
+#: ../dgit.1:1353
msgid "Settings likely to be useful for an end user include:"
msgstr ""
#. type: TP
-#: ../dgit.1:1237
+#: ../dgit.1:1353
#, no-wrap
msgid "B<dgit.default.build-products-dir>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1243
+#: ../dgit.1:1359
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:1243 ../dgit-downstream-dsc.7.pod:286
+#: ../dgit.1:1359 ../dgit-downstream-dsc.7.pod:286
#, no-wrap
msgid "B<dgit-suite.>I<suite>B<.distro> I<distro>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1248
+#: ../dgit.1:1364
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 "
msgstr ""
#. type: Plain text
-#: ../dgit.1:1251
+#: ../dgit.1:1367
msgid "I<suite> may be a glob pattern."
msgstr ""
#. type: TP
-#: ../dgit.1:1251
+#: ../dgit.1:1367
#, no-wrap
msgid "B<dgit.default.distro>I< distro>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1254
+#: ../dgit.1:1370
msgid "The default distro for an unknown suite."
msgstr ""
+#. type: Plain text
+#: ../dgit.1:1374
+msgid ""
+"This is only used if no B</usr/share/distro-info/>I<somedistro>B<.csv> "
+"mentions the specified suite."
+msgstr ""
+
#. type: TP
-#: ../dgit.1:1254
+#: ../dgit.1:1374
#, no-wrap
msgid "B<dgit.default.default-suite>I< suite>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1257
+#: ../dgit.1:1377
msgid "The default suite (eg for clone)."
msgstr ""
#. type: TP
-#: ../dgit.1:1257
+#: ../dgit.1:1377
#, no-wrap
msgid "B<dgit.default.>*"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1262
+#: ../dgit.1:1382
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:1262
+#: ../dgit.1:1382
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.clean-mode>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1266
+#: ../dgit.1:1386
msgid ""
"One of the values for the command line --clean= option; used if --clean is "
"not specified."
msgstr ""
#. type: TP
-#: ../dgit.1:1266
+#: ../dgit.1:1386
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.clean-mode-newer>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1272
+#: ../dgit.1:1392
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."
+"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 "
+"single git config compatible with different dgit versions."
msgstr ""
#. type: TP
-#: ../dgit.1:1272
+#: ../dgit.1:1392
#, no-wrap
-msgid "B<dgit-distro.>I<distro>B<.quilt->"
+msgid "B<dgit-distro.>I<distro>B<.quilt-mode>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1276
+#: ../dgit.1:1396
msgid ""
"One of the values for the command line --quilt= option; used if --quilt is "
"not specified."
msgstr ""
#. type: TP
-#: ../dgit.1:1276
+#: ../dgit.1:1396
+#, no-wrap
+msgid "B<dgit-distro.>I<distro>B<.split-view>"
+msgstr ""
+
+#. type: TP
+#: ../dgit.1:1398
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.rm-old-changes>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1280
+#: ../dgit.1:1402
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:1280
+#: ../dgit.1:1402
#, 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:1287
+#: ../dgit.1:1409
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, "
msgstr ""
#. type: TP
-#: ../dgit.1:1287
+#: ../dgit.1:1409
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.keyid>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1291
+#: ../dgit.1:1413
msgid "See also B<-k>."
msgstr ""
#. type: TP
-#: ../dgit.1:1291
+#: ../dgit.1:1413
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.mirror>I< url>"
msgstr ""
#. type: TP
-#: ../dgit.1:1293
+#: ../dgit.1:1415
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.username>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1296
+#: ../dgit.1:1418
msgid "Not relevant for Debian."
msgstr ""
#. type: =item
-#: ../dgit.1:1296 ../dgit-downstream-dsc.7.pod:242
+#: ../dgit.1:1418 ../dgit-downstream-dsc.7.pod:242
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.upload-host>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1299
+#: ../dgit.1:1421
msgid "Might be useful if you have an intermediate queue server."
msgstr ""
#. type: TP
-#: ../dgit.1:1299
+#: ../dgit.1:1421
#, 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:1304
+#: ../dgit.1:1426
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, "
msgstr ""
#. type: TP
-#: ../dgit.1:1304
+#: ../dgit.1:1426
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.setup-useremail>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1308
+#: ../dgit.1:1430
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."
+"Ignored for dgit setup-useremail, which does it anyway."
msgstr ""
#. type: TP
-#: ../dgit.1:1308
+#: ../dgit.1:1430
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.setup-mergechangelogs>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1313
+#: ../dgit.1:1435
msgid ""
-"Whether to setup a merge driver which uses dpkg-mergechangelogs for debian/"
+"Whether to set up a merge driver which uses dpkg-mergechangelogs for debian/"
"changelog. True by default. Ignored for dgit setup-mergechangelogs, which "
"does it anyway."
msgstr ""
#. type: TP
-#: ../dgit.1:1313
+#: ../dgit.1:1435
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.setup-gitattributes>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1319
+#: ../dgit.1:1441
msgid ""
"Whether to configure .git/info/attributes to suppress checkin/checkout file "
"content transformations in new git trees. True by default. Ignored for "
msgstr ""
#. type: TP
-#: ../dgit.1:1319
+#: ../dgit.1:1441
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.cmd->I<cmd>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1325
+#: ../dgit.1:1447
msgid "Program to use instead of I<cmd>. Works like B<-->I<cmd>B<=>... ."
msgstr ""
#. type: TP
-#: ../dgit.1:1325
+#: ../dgit.1:1447
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.opts->I<cmd>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1336
+#: ../dgit.1:1459
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 --"
-"add). The options for B<dgit.default.opts->I<cmd> B<dgit-distro."
-">I<distro>B</push.opts->I<cmd> and are all used, followed by options from "
-"dgit's command line."
+"add). The options for B<dgit.default.opts->I<cmd> and B<dgit-distro."
+">I<distro>B</push.opts->I<cmd> are all used, followed by options from dgit's "
+"command line."
msgstr ""
#. type: SH
-#: ../dgit.1:1336
+#: ../dgit.1:1459
#, no-wrap
msgid "ACCESS CONFIGURATION"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1341
+#: ../dgit.1:1464
msgid ""
"There are many other settings which specify how a particular distro's "
"services (archive and git) are provided. These should not normally be "
msgstr ""
#. type: TP
-#: ../dgit.1:1341
+#: ../dgit.1:1464
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.nominal-distro>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1344
+#: ../dgit.1:1467
msgid "Shown in git tags, Dgit fields, and so on."
msgstr ""
#. type: TP
-#: ../dgit.1:1344
+#: ../dgit.1:1467
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.alias-canon>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1347
+#: ../dgit.1:1470
msgid "Used for all access configuration lookup."
msgstr ""
#. type: TP
-#: ../dgit.1:1347
+#: ../dgit.1:1470
#, no-wrap
msgid "B<dgit-distro.>I<distro>B</push.>*"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1353
+#: ../dgit.1:1476
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:1353
+#: ../dgit.1:1476
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.git-url>"
msgstr ""
#. type: TP
-#: ../dgit.1:1355
+#: ../dgit.1:1478
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.git-url>[B<-suffix>]"
msgstr ""
#. type: TP
-#: ../dgit.1:1357
+#: ../dgit.1:1480
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.git-proto>"
msgstr ""
#. type: TP
-#: ../dgit.1:1359
+#: ../dgit.1:1482
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.git-path>"
msgstr ""
#. type: TP
-#: ../dgit.1:1361
+#: ../dgit.1:1484
#, 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:1363
+#: ../dgit.1:1486
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.git-check-suffix>"
msgstr ""
#. type: TP
-#: ../dgit.1:1365
+#: ../dgit.1:1488
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.diverts.divert> B<new-distro>|B</>I<distro-suffix>"
msgstr ""
#. type: TP
-#: ../dgit.1:1367
+#: ../dgit.1:1490
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.git-create>I< >B<ssh-cmd>I<|>B<true>"
msgstr ""
#. type: TP
-#: ../dgit.1:1369
+#: ../dgit.1:1492
#, 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:1371
+#: ../dgit.1:1494
#, 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:1373
+#: ../dgit.1:1496
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.madison-distro>"
msgstr ""
#. type: TP
-#: ../dgit.1:1375
+#: ../dgit.1:1498
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.archive-query-default-component>"
msgstr ""
#. type: TP
-#: ../dgit.1:1377
+#: ../dgit.1:1500
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.dgit-tag-format>"
msgstr ""
#. type: TP
-#: ../dgit.1:1379
+#: ../dgit.1:1502
#, 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:1381
+#: ../dgit.1:1504
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.ssh>"
msgstr ""
#. type: TP
-#: ../dgit.1:1383
+#: ../dgit.1:1506
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.sshpsql-dbname>"
msgstr ""
#. type: TP
-#: ../dgit.1:1385
+#: ../dgit.1:1508
#, 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:1387
+#: ../dgit.1:1510
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.backports-quirk>"
msgstr ""
#. type: TP
-#: ../dgit.1:1389
+#: ../dgit.1:1512
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.rewrite-map-enable>"
msgstr ""
#. type: TP
-#: ../dgit.1:1391
+#: ../dgit.1:1514
#, 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:1393
+#: ../dgit.1:1516
#, no-wrap
msgid "B<dgit.default.old-dsc-distro>"
msgstr ""
#. type: TP
-#: ../dgit.1:1395
+#: ../dgit.1:1518
#, no-wrap
msgid "B<dgit.dsc-url-proto-ok.>I<protocol>"
msgstr ""
#. type: TP
-#: ../dgit.1:1397
+#: ../dgit.1:1520
#, no-wrap
msgid "B<dgit.dsc-url-proto-ok.bad-syntax>"
msgstr ""
#. type: TP
-#: ../dgit.1:1399
+#: ../dgit.1:1522
#, no-wrap
msgid "B<dgit.default.dsc-url-proto-ok>"
msgstr ""
#. type: TP
-#: ../dgit.1:1401
+#: ../dgit.1:1524
#, no-wrap
msgid "B<dgit.vcs-git.suites> I<suite>[B<;>...]"
msgstr ""
#. type: SH
-#: ../dgit.1:1403
+#: ../dgit.1:1526
#, no-wrap
msgid "ENVIRONMENT VARIABLES"
msgstr ""
#. type: TP
-#: ../dgit.1:1404
+#: ../dgit.1:1527
#, no-wrap
msgid "B<DGIT_SSH>, B<GIT_SSH>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1413
+#: ../dgit.1:1536
msgid ""
"specify an alternative default program (and perhaps arguments) to use "
"instead of ssh. DGIT_SSH is consulted first and may contain arguments; if "
msgstr ""
#. type: TP
-#: ../dgit.1:1413
+#: ../dgit.1:1536
#, no-wrap
msgid "B<DEBEMAIL>, B<DEBFULLNAME>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1417
+#: ../dgit.1:1540
msgid ""
"Default git user.email and user.name for new trees. See B<dgit setup-new-"
"tree>."
msgstr ""
#. type: TP
-#: ../dgit.1:1417
+#: ../dgit.1:1540
#, no-wrap
-msgid "B<gpg>, B<dpkg->..., B<debsign>, B<git>, B<curl>, B<dput>, B<LWP::UserAgent>"
+msgid "B<gpg>, B<dpkg->..., B<debsign>, B<git>, [B<lib>]B<curl>, B<dput>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1422
+#: ../dgit.1:1545
msgid ""
"and other subprograms and modules used by dgit are affected by various "
"environment variables. Consult the documentation for those programs for "
msgstr ""
#. type: SH
-#: ../dgit.1:1422
+#: ../dgit.1:1545
#, no-wrap
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1429
+#: ../dgit.1:1552
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 "
msgstr ""
#. type: Plain text
-#: ../dgit.1:1435
+#: ../dgit.1:1558
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 "
msgstr ""
#. type: Plain text
-#: ../dgit.1:1440
+#: ../dgit.1:1563
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 "
msgstr ""
#. type: Plain text
-#: ../dgit.1:1445
+#: ../dgit.1:1568
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-"
msgstr ""
#. type: =head1
-#: ../dgit.1:1445 ../dgit.7:23 ../dgit-user.7.pod:447
+#: ../dgit.1:1568 ../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:598
-#: ../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:140
+#: ../git-debrebase.1.pod:633 ../git-debrebase.5.pod:678
+#: ../git-debpush.1.pod:261
#, no-wrap
msgid "SEE ALSO"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1454
+#: ../dgit.1:1577
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:1455
+#: ../dgit.1:1578
msgid "https://browse.dgit.debian.org/"
msgstr ""