diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2023-10-29 17:49:27 +0000 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2023-10-29 19:53:30 +0000 |
| commit | f44a37cd62f92c9c53e5d15faeb87f469d7b6547 (patch) | |
| tree | 07b11e013ed3830be757a608ae2b2f1517cc4319 /po4a | |
| parent | 103ee9713ac5e037fe5180e831bb1a96dd0478b5 (diff) | |
i18n-commit - autogenerated
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'po4a')
| -rw-r--r-- | po4a/dgit-maint-debrebase_7.pot | 50 | ||||
| -rw-r--r-- | po4a/dgit-maint-merge_7.pot | 191 | ||||
| -rw-r--r-- | po4a/dgit_1.pot | 756 | ||||
| -rw-r--r-- | po4a/git-debrebase_1.pot | 330 |
4 files changed, 634 insertions, 693 deletions
diff --git a/po4a/dgit-maint-debrebase_7.pot b/po4a/dgit-maint-debrebase_7.pot index eed6cd5..1decaa5 100644 --- a/po4a/dgit-maint-debrebase_7.pot +++ b/po4a/dgit-maint-debrebase_7.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2022-12-29 00:50+0000\n" +"POT-Creation-Date: 2023-10-29 17:49+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -28,12 +28,12 @@ msgid "NAME" msgstr "" #. type: =head1 -#: ../dgit.1:1676 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit.1:1680 ../dgit.7:23 ../dgit-user.7.pod:447 #: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:125 -#: ../dgit-maint-merge.7.pod:547 ../dgit-maint-gbp.7.pod:139 +#: ../dgit-maint-merge.7.pod:509 ../dgit-maint-gbp.7.pod:139 #: ../dgit-maint-debrebase.7.pod:792 ../dgit-downstream-dsc.7.pod:352 #: ../dgit-sponsorship.7.pod:322 ../dgit-maint-bpo.7.pod:140 -#: ../git-debrebase.1.pod:637 ../git-debrebase.5.pod:678 +#: ../git-debrebase.1.pod:643 ../git-debrebase.5.pod:678 #: ../git-debpush.1.pod:261 #, no-wrap msgid "SEE ALSO" @@ -68,8 +68,8 @@ msgid "" msgstr "" #. type: =head3 -#: ../dgit-maint-merge.7.pod:53 ../dgit-maint-merge.7.pod:385 -#: ../dgit-maint-merge.7.pod:464 ../dgit-maint-debrebase.7.pod:67 +#: ../dgit-maint-merge.7.pod:53 ../dgit-maint-merge.7.pod:347 +#: ../dgit-maint-merge.7.pod:426 ../dgit-maint-debrebase.7.pod:67 #: ../dgit-maint-debrebase.7.pod:362 msgid "When upstream tags releases in git" msgstr "" @@ -108,7 +108,7 @@ msgid "Finally, you need an orig tarball:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:97 ../dgit-maint-merge.7.pod:458 +#: ../dgit-maint-merge.7.pod:97 ../dgit-maint-merge.7.pod:420 #: ../dgit-maint-debrebase.7.pod:106 ../dgit-maint-debrebase.7.pod:429 #, no-wrap msgid "" @@ -174,8 +174,8 @@ msgid "" msgstr "" #. type: =head3 -#: ../dgit-maint-merge.7.pod:157 ../dgit-maint-merge.7.pod:397 -#: ../dgit-maint-merge.7.pod:489 ../dgit-maint-debrebase.7.pod:171 +#: ../dgit-maint-merge.7.pod:157 ../dgit-maint-merge.7.pod:359 +#: ../dgit-maint-merge.7.pod:451 ../dgit-maint-debrebase.7.pod:171 #: ../dgit-maint-debrebase.7.pod:374 msgid "When upstream releases only tarballs" msgstr "" @@ -238,17 +238,17 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:358 ../dgit-maint-debrebase.7.pod:482 +#: ../dgit-maint-merge.7.pod:320 ../dgit-maint-debrebase.7.pod:482 msgid "BUILDING AND UPLOADING" msgstr "" #. type: =head2 -#: ../dgit-maint-merge.7.pod:383 ../dgit-maint-debrebase.7.pod:360 +#: ../dgit-maint-merge.7.pod:345 ../dgit-maint-debrebase.7.pod:360 msgid "Obtaining the release" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:389 ../dgit-maint-debrebase.7.pod:366 +#: ../dgit-maint-merge.7.pod:351 ../dgit-maint-debrebase.7.pod:366 #, no-wrap msgid "" " % git fetch --tags upstream\n" @@ -256,7 +256,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:393 ../dgit-maint-debrebase.7.pod:370 +#: ../dgit-maint-merge.7.pod:355 ../dgit-maint-debrebase.7.pod:370 msgid "" "If you want to package an untagged upstream commit (because upstream does " "not tag releases or because you want to package an upstream development " @@ -264,7 +264,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:399 ../dgit-maint-debrebase.7.pod:376 +#: ../dgit-maint-merge.7.pod:361 ../dgit-maint-debrebase.7.pod:376 msgid "" "You will need the I<debian/gbp.conf> from \"When upstream releases only " "tarballs\", above. You will also need your upstream branch. Above, we " @@ -273,12 +273,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:404 ../dgit-maint-debrebase.7.pod:381 +#: ../dgit-maint-merge.7.pod:366 ../dgit-maint-debrebase.7.pod:381 msgid "Then, either" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:408 ../dgit-maint-debrebase.7.pod:385 +#: ../dgit-maint-merge.7.pod:370 ../dgit-maint-debrebase.7.pod:385 #, no-wrap msgid "" " % gbp import-orig ../foo_1.2.3.orig.tar.xz\n" @@ -286,12 +286,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:412 ../dgit-maint-debrebase.7.pod:389 +#: ../dgit-maint-merge.7.pod:374 ../dgit-maint-debrebase.7.pod:389 msgid "or if you have a working watch file" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:416 ../dgit-maint-debrebase.7.pod:393 +#: ../dgit-maint-merge.7.pod:378 ../dgit-maint-debrebase.7.pod:393 #, no-wrap msgid "" " % gbp import-orig --uscan\n" @@ -299,7 +299,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:452 ../dgit-maint-debrebase.7.pod:423 +#: ../dgit-maint-merge.7.pod:414 ../dgit-maint-debrebase.7.pod:423 msgid "" "If you obtained a tarball from upstream, you are ready to try a build. If " "you merged a git tag from upstream, you will first need to generate a " @@ -307,12 +307,12 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:462 ../dgit-maint-debrebase.7.pod:517 +#: ../dgit-maint-merge.7.pod:424 ../dgit-maint-debrebase.7.pod:517 msgid "HANDLING DFSG-NON-FREE MATERIAL" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:491 ../dgit-maint-debrebase.7.pod:591 +#: ../dgit-maint-merge.7.pod:453 ../dgit-maint-debrebase.7.pod:591 msgid "" "The easiest way to handle this is to add a B<Files-Excluded> field to " "I<debian/copyright>, and a B<uversionmangle> setting in I<debian/watch>. " @@ -321,20 +321,20 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:536 ../dgit-maint-gbp.7.pod:133 +#: ../dgit-maint-merge.7.pod:498 ../dgit-maint-gbp.7.pod:133 #: ../dgit-maint-debrebase.7.pod:596 msgid "INCORPORATING NMUS" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:551 ../dgit-maint-gbp.7.pod:143 +#: ../dgit-maint-merge.7.pod:513 ../dgit-maint-gbp.7.pod:143 #: ../dgit-maint-debrebase.7.pod:796 ../dgit-maint-bpo.7.pod:144 #: ../git-debpush.1.pod:266 msgid "AUTHOR" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:553 ../dgit-maint-debrebase.7.pod:798 +#: ../dgit-maint-merge.7.pod:515 ../dgit-maint-debrebase.7.pod:798 msgid "" "This tutorial was written and is maintained by Sean Whitton " "<spwhitton@spwhitton.name>. It contains contributions from other dgit " @@ -1396,5 +1396,5 @@ msgstr "" #. type: textblock #: ../dgit-maint-debrebase.7.pod:794 -msgid "dgit(1), dgit(7), git-debrebase(1), git-debrebase(5)" +msgid "dgit(1), dgit(7), git-debrebase(1), git-debrebase(5), gitrevisions(7)" msgstr "" diff --git a/po4a/dgit-maint-merge_7.pot b/po4a/dgit-maint-merge_7.pot index af37e42..ffecafb 100644 --- a/po4a/dgit-maint-merge_7.pot +++ b/po4a/dgit-maint-merge_7.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2022-12-29 00:50+0000\n" +"POT-Creation-Date: 2023-10-29 17:49+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -28,30 +28,30 @@ msgid "NAME" msgstr "" #. type: =item -#: ../dgit.1:296 ../dgit-maint-merge.7.pod:502 +#: ../dgit.1:298 ../dgit-maint-merge.7.pod:464 #, no-wrap msgid "1." msgstr "" #. type: =item -#: ../dgit.1:297 ../dgit-maint-merge.7.pod:506 +#: ../dgit.1:299 ../dgit-maint-merge.7.pod:468 #, no-wrap msgid "2." msgstr "" #. type: =item -#: ../dgit.1:298 ../dgit-maint-merge.7.pod:511 +#: ../dgit.1:300 ../dgit-maint-merge.7.pod:473 #, no-wrap msgid "3." msgstr "" #. type: =head1 -#: ../dgit.1:1676 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit.1:1680 ../dgit.7:23 ../dgit-user.7.pod:447 #: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:125 -#: ../dgit-maint-merge.7.pod:547 ../dgit-maint-gbp.7.pod:139 +#: ../dgit-maint-merge.7.pod:509 ../dgit-maint-gbp.7.pod:139 #: ../dgit-maint-debrebase.7.pod:792 ../dgit-downstream-dsc.7.pod:352 #: ../dgit-sponsorship.7.pod:322 ../dgit-maint-bpo.7.pod:140 -#: ../git-debrebase.1.pod:637 ../git-debrebase.5.pod:678 +#: ../git-debrebase.1.pod:643 ../git-debrebase.5.pod:678 #: ../git-debpush.1.pod:261 #, no-wrap msgid "SEE ALSO" @@ -65,14 +65,8 @@ msgstr "" msgid "INTRODUCTION" msgstr "" -#. type: textblock -#: ../dgit-user.7.pod:449 ../dgit-maint-native.7.pod:127 -#: ../dgit-maint-merge.7.pod:549 ../dgit-maint-gbp.7.pod:141 -msgid "dgit(1), dgit(7)" -msgstr "" - #. type: verbatim -#: ../dgit-maint-native.7.pod:106 ../dgit-maint-merge.7.pod:540 +#: ../dgit-maint-native.7.pod:106 ../dgit-maint-merge.7.pod:502 #, no-wrap msgid "" " % dgit pull\n" @@ -149,8 +143,8 @@ msgid "" msgstr "" #. type: =head3 -#: ../dgit-maint-merge.7.pod:53 ../dgit-maint-merge.7.pod:385 -#: ../dgit-maint-merge.7.pod:464 ../dgit-maint-debrebase.7.pod:67 +#: ../dgit-maint-merge.7.pod:53 ../dgit-maint-merge.7.pod:347 +#: ../dgit-maint-merge.7.pod:426 ../dgit-maint-debrebase.7.pod:67 #: ../dgit-maint-debrebase.7.pod:362 msgid "When upstream tags releases in git" msgstr "" @@ -218,7 +212,7 @@ msgid "Finally, you need an orig tarball:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:97 ../dgit-maint-merge.7.pod:458 +#: ../dgit-maint-merge.7.pod:97 ../dgit-maint-merge.7.pod:420 #: ../dgit-maint-debrebase.7.pod:106 ../dgit-maint-debrebase.7.pod:429 #, no-wrap msgid "" @@ -315,8 +309,8 @@ msgid "" msgstr "" #. type: =head3 -#: ../dgit-maint-merge.7.pod:157 ../dgit-maint-merge.7.pod:397 -#: ../dgit-maint-merge.7.pod:489 ../dgit-maint-debrebase.7.pod:171 +#: ../dgit-maint-merge.7.pod:157 ../dgit-maint-merge.7.pod:359 +#: ../dgit-maint-merge.7.pod:451 ../dgit-maint-debrebase.7.pod:171 #: ../dgit-maint-debrebase.7.pod:374 msgid "When upstream releases only tarballs" msgstr "" @@ -542,7 +536,7 @@ msgstr "" #. type: =head1 #: ../dgit-maint-merge.7.pod:288 -msgid "SOURCE PACKAGE AND GIT WORKING TREE CONFIGURATION" +msgid "SOURCE PACKAGE AND GIT CONFIGURATION" msgstr "" #. type: =head2 @@ -568,31 +562,25 @@ msgstr "" #. type: textblock #: ../dgit-maint-merge.7.pod:301 msgid "" -"This affects only this one git tree; your other git trees for this package " -"(and co-maintainers) will need it too. Don't set it more globally, because " -"the maintainers of any other packages you work on, or send patches for, may " -"be offended by its effects." -msgstr "" - -#. type: textblock -#: ../dgit-maint-merge.7.pod:309 -msgid "unpleasant NMUs" +"This command should be executed in each git clone of this package, including " +"your co-maintainer's. Don't set it more globally, because it is not a good " +"default for working on Debian source packages in general." msgstr "" #. type: =head2 -#: ../dgit-maint-merge.7.pod:311 +#: ../dgit-maint-merge.7.pod:305 msgid "debian/source/options" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:313 +#: ../dgit-maint-merge.7.pod:307 msgid "" "We set a source package option to help dpkg handle changes to the upstream " "source:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:319 +#: ../dgit-maint-merge.7.pod:313 #, no-wrap msgid "" " auto-commit\n" @@ -600,69 +588,19 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:323 +#: ../dgit-maint-merge.7.pod:317 msgid "" "You don't need to create this file if you are using the version 1.0 source " "package format." msgstr "" -#. type: =head2 -#: ../dgit-maint-merge.7.pod:326 -msgid "Sample text for debian/README.source" -msgstr "" - -#. type: textblock -#: ../dgit-maint-merge.7.pod:328 -msgid "" -"It is a good idea to explain how a user can obtain a breakdown of the " -"changes to the upstream source:" -msgstr "" - -#. type: textblock -#: ../dgit-maint-merge.7.pod:333 -msgid "" -"The Debian packaging of foo is maintained in git, using the merging workflow " -"described in dgit-maint-merge(7). There isn't a patch queue that can be " -"represented as a quilt series." -msgstr "" - -#. type: textblock -#: ../dgit-maint-merge.7.pod:337 -msgid "" -"A detailed breakdown of the changes is available from their canonical " -"representation - git commits in the packaging repository. For example, to " -"see the changes made by the Debian maintainer in the first upload of " -"upstream version 1.2.3, you could use:" -msgstr "" - -#. type: verbatim -#: ../dgit-maint-merge.7.pod:345 -#, no-wrap -msgid "" -" % git clone https://git.dgit.debian.org/foo\n" -" % cd foo\n" -" % git log --oneline 1.2.3..debian/1.2.3-1 -- . ':!debian'\n" -"\n" -msgstr "" - -#. type: textblock -#: ../dgit-maint-merge.7.pod:351 -msgid "" -"(If you have dgit, use `dgit clone foo`, rather than plain `git clone`.)" -msgstr "" - -#. type: textblock -#: ../dgit-maint-merge.7.pod:354 -msgid "A single combined diff, containing all the changes, follows." -msgstr "" - #. type: =head1 -#: ../dgit-maint-merge.7.pod:358 ../dgit-maint-debrebase.7.pod:482 +#: ../dgit-maint-merge.7.pod:320 ../dgit-maint-debrebase.7.pod:482 msgid "BUILDING AND UPLOADING" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:360 +#: ../dgit-maint-merge.7.pod:322 msgid "" "Use B<dgit build>, B<dgit sbuild>, B<dgit pbuilder>, B<dgit cowbuilder>, " "B<dgit push-source>, and B<dgit push-built> as detailed in dgit(1). If any " @@ -672,14 +610,14 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:366 +#: ../dgit-maint-merge.7.pod:328 msgid "" "If you want to upload with git-debpush(1), for the first upload you should " "pass the B<--quilt=single> quilt mode option (see git-debpush(1))." msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:370 +#: ../dgit-maint-merge.7.pod:332 msgid "" "As another alternative to B<dgit build> and friends, you can use a tool like " "gitpkg(1). This works because like dgit, gitpkg(1) enforces that HEAD has " @@ -690,7 +628,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:377 +#: ../dgit-maint-merge.7.pod:339 msgid "" "If you want to skip dgit's checks while iterating on a problem with the " "package build (for example, you don't want to commit your changes to git), " @@ -698,17 +636,17 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:381 +#: ../dgit-maint-merge.7.pod:343 msgid "NEW UPSTREAM RELEASES" msgstr "" #. type: =head2 -#: ../dgit-maint-merge.7.pod:383 ../dgit-maint-debrebase.7.pod:360 +#: ../dgit-maint-merge.7.pod:345 ../dgit-maint-debrebase.7.pod:360 msgid "Obtaining the release" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:389 ../dgit-maint-debrebase.7.pod:366 +#: ../dgit-maint-merge.7.pod:351 ../dgit-maint-debrebase.7.pod:366 #, no-wrap msgid "" " % git fetch --tags upstream\n" @@ -716,7 +654,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:393 ../dgit-maint-debrebase.7.pod:370 +#: ../dgit-maint-merge.7.pod:355 ../dgit-maint-debrebase.7.pod:370 msgid "" "If you want to package an untagged upstream commit (because upstream does " "not tag releases or because you want to package an upstream development " @@ -724,7 +662,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:399 ../dgit-maint-debrebase.7.pod:376 +#: ../dgit-maint-merge.7.pod:361 ../dgit-maint-debrebase.7.pod:376 msgid "" "You will need the I<debian/gbp.conf> from \"When upstream releases only " "tarballs\", above. You will also need your upstream branch. Above, we " @@ -733,12 +671,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:404 ../dgit-maint-debrebase.7.pod:381 +#: ../dgit-maint-merge.7.pod:366 ../dgit-maint-debrebase.7.pod:381 msgid "Then, either" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:408 ../dgit-maint-debrebase.7.pod:385 +#: ../dgit-maint-merge.7.pod:370 ../dgit-maint-debrebase.7.pod:385 #, no-wrap msgid "" " % gbp import-orig ../foo_1.2.3.orig.tar.xz\n" @@ -746,12 +684,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:412 ../dgit-maint-debrebase.7.pod:389 +#: ../dgit-maint-merge.7.pod:374 ../dgit-maint-debrebase.7.pod:389 msgid "or if you have a working watch file" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:416 ../dgit-maint-debrebase.7.pod:393 +#: ../dgit-maint-merge.7.pod:378 ../dgit-maint-debrebase.7.pod:393 #, no-wrap msgid "" " % gbp import-orig --uscan\n" @@ -759,17 +697,17 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:420 +#: ../dgit-maint-merge.7.pod:382 msgid "In the following, replace I<1.2.3> with I<upstream/1.2.3>." msgstr "" #. type: =head2 -#: ../dgit-maint-merge.7.pod:422 +#: ../dgit-maint-merge.7.pod:384 msgid "Reviewing & merging the release" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:424 +#: ../dgit-maint-merge.7.pod:386 msgid "" "It's a good idea to preview the merge of the new upstream release. First, " "just check for any new or deleted files that may need accounting for in your " @@ -777,7 +715,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:430 +#: ../dgit-maint-merge.7.pod:392 #, no-wrap msgid "" " % git diff --name-status --diff-filter=ADR master..1.2.3 -- . ':!debian'\n" @@ -785,12 +723,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:434 +#: ../dgit-maint-merge.7.pod:396 msgid "You can then review the full merge diff:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:438 +#: ../dgit-maint-merge.7.pod:400 #, no-wrap msgid "" " % git merge-tree `git merge-base master 1.2.3` master 1.2.3 | $PAGER\n" @@ -798,12 +736,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:442 +#: ../dgit-maint-merge.7.pod:404 msgid "Once you're satisfied with what will be merged, update your package:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:446 +#: ../dgit-maint-merge.7.pod:408 #, no-wrap msgid "" " % git merge 1.2.3\n" @@ -813,7 +751,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:452 ../dgit-maint-debrebase.7.pod:423 +#: ../dgit-maint-merge.7.pod:414 ../dgit-maint-debrebase.7.pod:423 msgid "" "If you obtained a tarball from upstream, you are ready to try a build. If " "you merged a git tag from upstream, you will first need to generate a " @@ -821,17 +759,17 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:462 ../dgit-maint-debrebase.7.pod:517 +#: ../dgit-maint-merge.7.pod:424 ../dgit-maint-debrebase.7.pod:517 msgid "HANDLING DFSG-NON-FREE MATERIAL" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:466 +#: ../dgit-maint-merge.7.pod:428 msgid "We create a DFSG-clean tag to merge to master:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:470 +#: ../dgit-maint-merge.7.pod:432 #, no-wrap msgid "" " % git checkout -b pre-dfsg 1.2.3\n" @@ -844,7 +782,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:479 +#: ../dgit-maint-merge.7.pod:441 msgid "" "Before merging the new 1.2.3+dfsg tag to master, you should first determine " "whether it would be legally dangerous for the non-free material to be " @@ -852,7 +790,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:484 +#: ../dgit-maint-merge.7.pod:446 msgid "" "If it would be dangerous, there is a big problem; in this case please " "consult your archive administrators (for Debian this is the dgit " @@ -861,7 +799,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:491 ../dgit-maint-debrebase.7.pod:591 +#: ../dgit-maint-merge.7.pod:453 ../dgit-maint-debrebase.7.pod:591 msgid "" "The easiest way to handle this is to add a B<Files-Excluded> field to " "I<debian/copyright>, and a B<uversionmangle> setting in I<debian/watch>. " @@ -870,40 +808,40 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:496 +#: ../dgit-maint-merge.7.pod:458 msgid "FORWARDING PATCHES UPSTREAM" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:498 +#: ../dgit-maint-merge.7.pod:460 msgid "The basic steps are:" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:504 +#: ../dgit-maint-merge.7.pod:466 msgid "Create a new branch based off upstream's master branch." msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:508 +#: ../dgit-maint-merge.7.pod:470 msgid "" "git-cherry-pick(1) commits from your master branch onto your new branch." msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:513 +#: ../dgit-maint-merge.7.pod:475 msgid "" "Push the branch somewhere and ask upstream to merge it, or use git-format-" "patch(1) or git-request-pull(1)." msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:518 +#: ../dgit-maint-merge.7.pod:480 msgid "For example (and it is only an example):" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:522 +#: ../dgit-maint-merge.7.pod:484 #, no-wrap msgid "" " % # fork foo.git on GitHub\n" @@ -917,7 +855,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:532 +#: ../dgit-maint-merge.7.pod:494 msgid "" "Note that when you merge an upstream release containing your forwarded " "patches, git and dgit will transparently handle \"dropping\" the patches " @@ -925,27 +863,32 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:536 ../dgit-maint-gbp.7.pod:133 +#: ../dgit-maint-merge.7.pod:498 ../dgit-maint-gbp.7.pod:133 #: ../dgit-maint-debrebase.7.pod:596 msgid "INCORPORATING NMUS" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:544 +#: ../dgit-maint-merge.7.pod:506 msgid "" "Alternatively, you can apply the NMU diff to your repository. The next push " "will then require I<--overwrite>." msgstr "" +#. type: textblock +#: ../dgit-maint-merge.7.pod:511 +msgid "dgit(1), dgit(7), gitrevisions(7)" +msgstr "" + #. type: =head1 -#: ../dgit-maint-merge.7.pod:551 ../dgit-maint-gbp.7.pod:143 +#: ../dgit-maint-merge.7.pod:513 ../dgit-maint-gbp.7.pod:143 #: ../dgit-maint-debrebase.7.pod:796 ../dgit-maint-bpo.7.pod:144 #: ../git-debpush.1.pod:266 msgid "AUTHOR" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:553 ../dgit-maint-debrebase.7.pod:798 +#: ../dgit-maint-merge.7.pod:515 ../dgit-maint-debrebase.7.pod:798 msgid "" "This tutorial was written and is maintained by Sean Whitton " "<spwhitton@spwhitton.name>. It contains contributions from other dgit " diff --git a/po4a/dgit_1.pot b/po4a/dgit_1.pot index bdfca0f..d4eba39 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: 2022-12-29 00:50+0000\n" +"POT-Creation-Date: 2023-10-29 17:49+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -418,7 +418,7 @@ msgid "B<dgit help>" msgstr "" #. type: Plain text -#: ../dgit.1:185 ../dgit.1:1346 +#: ../dgit.1:185 ../dgit.1:1350 msgid "Print a usage summary." msgstr "" @@ -515,16 +515,19 @@ msgstr "" #: ../dgit.1:241 msgid "" "Does an `upload': sends the current HEAD to dgit-repos (as git commits), and " -"to the archive (as a source package, built by dgit push-source)." +"to the archive (as a source package, built by this command)." msgstr "" #. type: Plain text -#: ../dgit.1:243 -msgid "This is the usual way to upload to Debian." +#: ../dgit.1:245 +msgid "" +"This is the usual way to upload to Debian. It is like saying \"update the " +"source code in the archive to match my git HEAD, and let the autobuilders do " +"the rest.\"" msgstr "" #. type: Plain text -#: ../dgit.1:254 +#: ../dgit.1:256 msgid "" "In more detail: dgit push-source builds a source package from HEAD. It then " "pushes the HEAD to the suite's dgit-repos branch, adjusts the .changes to " @@ -536,7 +539,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:258 +#: ../dgit.1:260 msgid "" "dgit push always uses the package, suite and version specified in the debian/" "changelog and the .dsc, which must agree. If the command line specifies a " @@ -544,27 +547,27 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:263 +#: ../dgit.1:265 msgid "" "When used on a git-debrebase branch, dgit calls git-debrebase to prepare the " "branch for source package upload and push." msgstr "" #. type: Plain text -#: ../dgit.1:267 +#: ../dgit.1:269 msgid "" "With B<-C>, dgit push-source performs a dgit push-built, additionally " "ensuring that no binary packages are uploaded." msgstr "" #. type: TP -#: ../dgit.1:267 +#: ../dgit.1:269 #, no-wrap msgid "B<dgit push-built> [I<suite>]" msgstr "" #. type: Plain text -#: ../dgit.1:274 +#: ../dgit.1:276 msgid "" "Does an `upload' of a previously built package, possibly including " "binaries. Sends the current HEAD to dgit-repos (as git commits); and, sends " @@ -572,31 +575,31 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:281 +#: ../dgit.1:283 msgid "" "The package must already have been built ready for upload, with the .dsc " "and .changes left in the parent directory. It is normally best to do the " -"build with dgit too (eg with dgit sbuild): some existing build tools pass " +"build with dgit too (e.g. with dgit sbuild): some existing build tools pass " "unhelpful options to dpkg-source et al by default, which can result in the " "built source package not being identical to the git tree." msgstr "" #. type: Plain text -#: ../dgit.1:286 +#: ../dgit.1:288 msgid "" "dgit will check that the .dsc corresponds exactly to the current HEAD, " -"ensuring that all users whether of the dgit git view, or of the traditional " +"ensuring that all users, whether of the dgit git view, or of the traditional " "archive, see the same source package." msgstr "" #. type: TP -#: ../dgit.1:286 +#: ../dgit.1:288 #, no-wrap msgid "B<dgit rpush-source>|B<rpush-built> I<build-host>B<:>I<src-dir> [I<push args...>]" msgstr "" #. type: Plain text -#: ../dgit.1:293 +#: ../dgit.1:295 msgid "" "Pushes the contents of the specified directory on a remote machine. This is " "like running dgit push on build-host with src-dir as the current directory; " @@ -606,67 +609,67 @@ msgid "" msgstr "" #. type: =item -#: ../dgit.1:296 ../dgit-maint-merge.7.pod:502 +#: ../dgit.1:298 ../dgit-maint-merge.7.pod:464 #, no-wrap msgid "1." msgstr "" #. type: tbl table -#: ../dgit.1:296 +#: ../dgit.1:298 #, no-wrap msgid "Clone on build host (dgit clone)" msgstr "" #. type: =item -#: ../dgit.1:297 ../dgit-maint-merge.7.pod:506 +#: ../dgit.1:299 ../dgit-maint-merge.7.pod:468 #, no-wrap msgid "2." msgstr "" #. type: tbl table -#: ../dgit.1:297 +#: ../dgit.1:299 #, no-wrap msgid "Edit code on build host (edit, git commit)" msgstr "" #. type: =item -#: ../dgit.1:298 ../dgit-maint-merge.7.pod:511 +#: ../dgit.1:300 ../dgit-maint-merge.7.pod:473 #, no-wrap msgid "3." msgstr "" #. type: tbl table -#: ../dgit.1:298 +#: ../dgit.1:300 #, no-wrap msgid "Build package on build host (dgit build)" msgstr "" #. type: tbl table -#: ../dgit.1:299 +#: ../dgit.1:301 #, no-wrap msgid "4." msgstr "" #. type: tbl table -#: ../dgit.1:299 +#: ../dgit.1:301 #, no-wrap msgid "Test package on build host or elsewhere (dpkg -i, test)" msgstr "" #. type: tbl table -#: ../dgit.1:300 +#: ../dgit.1:302 #, no-wrap msgid "5." msgstr "" #. type: tbl table -#: ../dgit.1:300 +#: ../dgit.1:302 #, no-wrap msgid "Upload by invoking dgit rpush on host with your GPG key." msgstr "" #. type: Plain text -#: ../dgit.1:306 +#: ../dgit.1:308 msgid "" "However, the build-host must be able to ssh to the dgit repos. If this is " "not already the case, you must organise it separately, for example by the " @@ -674,14 +677,14 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:310 +#: ../dgit.1:312 msgid "" "The remaining arguments are treated just as dgit push-source or dgit push-" "built would handle them." msgstr "" #. type: Plain text -#: ../dgit.1:315 +#: ../dgit.1:317 msgid "" "build-host and build-dir can be passed as separate arguments; this is " "assumed to be the case if the first argument contains no : (except perhaps " @@ -689,7 +692,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:319 +#: ../dgit.1:321 msgid "" "You will need similar enough versions of dgit on the build-host and the " "invocation host. The build-host needs gnupg installed, with your public key " @@ -697,88 +700,88 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:319 +#: ../dgit.1:321 #, no-wrap msgid "B<dgit push>|B<rpush> I<...>" msgstr "" #. type: Plain text -#: ../dgit.1:330 +#: ../dgit.1:332 msgid "" -"Configurable aliases for B<dgit push-built> and B<dgit rpush-built>, which " -"will in the future change to mean B<dgit push-source> and B<dgit rpush-" -"source>, and therefore currently generate a warning." +"Configurable aliases for B<dgit push-built> and B<dgit rpush-built>. These " +"aliases will in the future change to mean B<dgit push-source> and B<dgit " +"rpush-source>, and therefore they currently generate a warning." msgstr "" #. type: Plain text -#: ../dgit.1:334 +#: ../dgit.1:336 msgid "" "The behaviour of dgit push is controlled by the B<dgit.default.push-subcmd> " "git config option:" msgstr "" #. type: tbl table -#: ../dgit.1:336 +#: ../dgit.1:338 #, no-wrap msgid "B<source>" msgstr "" #. type: tbl table -#: ../dgit.1:336 +#: ../dgit.1:338 #, no-wrap msgid "runs B<dgit push-source>" msgstr "" #. type: tbl table -#: ../dgit.1:336 +#: ../dgit.1:338 #, no-wrap msgid "future default" msgstr "" #. type: tbl table -#: ../dgit.1:337 +#: ../dgit.1:339 #, no-wrap msgid "B<built>" msgstr "" #. type: tbl table -#: ../dgit.1:337 +#: ../dgit.1:339 #, no-wrap msgid "and runs B<dgit push-built>" msgstr "" #. type: tbl table -#: ../dgit.1:338 +#: ../dgit.1:340 #, no-wrap msgid "B<built,warn>" msgstr "" #. type: tbl table -#: ../dgit.1:338 +#: ../dgit.1:340 #, no-wrap msgid "warns, and runs B<dgit push-built>" msgstr "" #. type: tbl table -#: ../dgit.1:338 +#: ../dgit.1:340 #, no-wrap msgid "current default" msgstr "" #. type: tbl table -#: ../dgit.1:339 +#: ../dgit.1:341 #, no-wrap msgid "B<reject>" msgstr "" #. type: tbl table -#: ../dgit.1:339 +#: ../dgit.1:341 #, no-wrap msgid "fails" msgstr "" #. type: Plain text -#: ../dgit.1:350 +#: ../dgit.1:352 msgid "" "For dgit rpush, the behaviour is controlled by B<dgit.default.rpush-subcmd>, " "falling back to B<dgit.default.push-subcmd> if that is not set. Because " @@ -787,7 +790,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:360 +#: ../dgit.1:362 msgid "" "These settings can safely be passed to older dgit (via B<-c);> the value " "B<built> will be supported indefinitely. This should be used in scripts " @@ -796,13 +799,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:360 +#: ../dgit.1:362 #, no-wrap msgid "B<dgit setup-new-tree>" msgstr "" #. type: Plain text -#: ../dgit.1:376 +#: ../dgit.1:378 msgid "" "Configure the current working tree the way that dgit clone would have set it " "up. Like running B<dgit setup-useremail>, B<setup-mergechangelogs> and " @@ -813,13 +816,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:376 +#: ../dgit.1:378 #, no-wrap msgid "B<dgit setup-useremail>" msgstr "" #. type: Plain text -#: ../dgit.1:382 +#: ../dgit.1:384 msgid "" "Set the working tree's user.name and user.email from the distro-specific " "dgit configuration (B<dgit-distro.>I<distro>B<.user-name> and B<.user-" @@ -827,26 +830,26 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:382 +#: ../dgit.1:384 #, no-wrap msgid "B<dgit setup-mergechangelogs>" msgstr "" #. type: Plain text -#: ../dgit.1:388 +#: ../dgit.1:390 msgid "" "Configures a git merge helper for the file B<debian/changelog> which uses " "B<dpkg-mergechangelogs>." msgstr "" #. type: TP -#: ../dgit.1:388 +#: ../dgit.1:390 #, no-wrap msgid "B<dgit setup-gitattributes>" msgstr "" #. type: Plain text -#: ../dgit.1:403 +#: ../dgit.1:405 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 " @@ -856,7 +859,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:411 +#: ../dgit.1:413 msgid "" "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 " @@ -865,7 +868,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:422 +#: ../dgit.1:424 msgid "" "(If there is already a macro attribute line B<[attr]dgit-defuse-attrs> in ." "git/info/attributes which does what dgit requires (whatever files it " @@ -875,13 +878,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:422 +#: ../dgit.1:424 #, no-wrap msgid "B<dgit quilt-fixup>" msgstr "" #. type: Plain text -#: ../dgit.1:429 +#: ../dgit.1:431 msgid "" "`3.0 (quilt)' format source packages need changes representing not only in-" "tree but also as patches in debian/patches. dgit quilt-fixup checks whether " @@ -890,12 +893,12 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:431 +#: ../dgit.1:433 msgid "This is normally done automatically by dgit build and dgit push." msgstr "" #. type: Plain text -#: ../dgit.1:437 +#: ../dgit.1:439 msgid "" "dgit will try to turn each relevant commit in your git history into a new " "quilt patch. dgit cannot convert nontrivial merges, or certain other kinds " @@ -905,7 +908,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:446 +#: ../dgit.1:448 msgid "" "When used with a git-debrebase branch, dgit will ask git-debrebase to " "prepare patches. However, dgit can make patches in some situations where " @@ -915,25 +918,25 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:451 +#: ../dgit.1:453 msgid "See B<FORMAT 3.0 (QUILT)> in B<dgit(7)>." msgstr "" #. type: TP -#: ../dgit.1:451 +#: ../dgit.1:453 #, no-wrap msgid "B<dgit import-dsc> [I<sub-options>] I<../path/to/.dsc> [B<+>|B<..>]branch" msgstr "" #. type: Plain text -#: ../dgit.1:457 +#: ../dgit.1:459 msgid "" "Import a Debian-format source package, specified by its .dsc, into git, the " "way dgit fetch would do." msgstr "" #. type: Plain text -#: ../dgit.1:468 +#: ../dgit.1:470 msgid "" "This does about half the work of dgit fetch: it will convert the .dsc into a " "new, orphan git branch. Since dgit has no access to a corresponding source " @@ -944,7 +947,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:478 +#: ../dgit.1:480 msgid "" "Because a .dsc can contain a Dgit field naming a git commit (which you might " "not have), and specifying where to find that commit (and any history rewrite " @@ -954,12 +957,12 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:480 +#: ../dgit.1:482 msgid "There is only one sub-option:" msgstr "" #. type: Plain text -#: ../dgit.1:486 +#: ../dgit.1:488 msgid "" "B<--require-valid-signature> causes dgit to insist that the signature on " "the .dsc is valid (using the same criteria as dpkg-source -x). Otherwise, " @@ -968,7 +971,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:505 +#: ../dgit.1:507 msgid "" "If I<branch> is prefixed with B<+> then if it already exists, it will be " "simply overwritten, no matter its existing contents. If I<branch> is " @@ -980,55 +983,55 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:509 +#: ../dgit.1:511 msgid "If I<branch> does not start with refs/, refs/heads/ is prepended." msgstr "" #. type: TP -#: ../dgit.1:509 +#: ../dgit.1:511 #, no-wrap msgid "B<dgit version>" msgstr "" #. type: Plain text -#: ../dgit.1:512 +#: ../dgit.1:514 msgid "Prints version information and exits." msgstr "" #. type: TP -#: ../dgit.1:512 +#: ../dgit.1:514 #, no-wrap msgid "B<dgit clone-dgit-repos-server>I< destdir>" msgstr "" #. type: Plain text -#: ../dgit.1:516 +#: ../dgit.1:518 msgid "" "Tries to fetch a copy of the source code for the dgit-repos-server, as " "actually being used on the dgit git server, as a git tree." msgstr "" #. type: TP -#: ../dgit.1:516 +#: ../dgit.1:518 #, no-wrap msgid "B<dgit print-dgit-repos-server-source-url>" msgstr "" #. type: Plain text -#: ../dgit.1:521 +#: ../dgit.1:523 msgid "" "Prints the url used by dgit clone-dgit-repos-server. This is hopefully " "suitable for use as a git remote url. It may not be useable in a browser." msgstr "" #. type: TP -#: ../dgit.1:521 +#: ../dgit.1:523 #, no-wrap msgid "B<dgit print-dpkg-source-ignores>" msgstr "" #. type: Plain text -#: ../dgit.1:528 +#: ../dgit.1:530 msgid "" "Prints the -i and -I arguments which must be passed to dpkg-souce to cause " "it to exclude exactly the .git directory and nothing else. The separate " @@ -1036,13 +1039,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:528 +#: ../dgit.1:530 #, no-wrap msgid "B<dgit print-unapplied-treeish>" msgstr "" #. type: Plain text -#: ../dgit.1:539 +#: ../dgit.1:541 msgid "" "Constructs a tree-ish approximating the patches-unapplied state of your 3.0 " "(quilt) package, and prints the git object name to stdout. This requires " @@ -1053,7 +1056,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:546 +#: ../dgit.1:548 msgid "" "To make this operate off-line, the access configuration key which is used to " "determine the build-products-dir is the uncanonicalised version of the suite " @@ -1062,24 +1065,24 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:548 +#: ../dgit.1:550 msgid "This function is primarily provided for the benefit of git-debrebase." msgstr "" #. type: =head1 -#: ../dgit.1:548 ../git-debrebase.1.pod:477 +#: ../dgit.1:550 ../git-debrebase.1.pod:473 #, no-wrap msgid "OPTIONS" msgstr "" #. type: TP -#: ../dgit.1:549 +#: ../dgit.1:551 #, no-wrap msgid "B<-k>I<keyid>" msgstr "" #. type: Plain text -#: ../dgit.1:558 +#: ../dgit.1:560 msgid "" "Use I<keyid> for signing the tag and the upload. The default comes from the " "distro's B<keyid> config setting (see CONFIGURATION, below), or failing " @@ -1087,24 +1090,24 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:558 +#: ../dgit.1:560 #, no-wrap msgid "B<--no-sign>" msgstr "" #. type: Plain text -#: ../dgit.1:561 +#: ../dgit.1:563 msgid "does not sign tags or uploads (meaningful only with push)." msgstr "" #. type: TP -#: ../dgit.1:562 +#: ../dgit.1:564 #, no-wrap msgid "B<-p>I<package>" msgstr "" #. type: Plain text -#: ../dgit.1:568 +#: ../dgit.1:570 msgid "" "Specifies that we should process source package I<package> rather than " "looking in debian/control or debian/changelog. Valid with dgit fetch and " @@ -1112,27 +1115,27 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:568 +#: ../dgit.1:570 #, no-wrap msgid "B<--clean=git> | B<-wg>" msgstr "" #. type: Plain text -#: ../dgit.1:574 +#: ../dgit.1:576 msgid "" "Use B<git clean -xdf> to clean the working tree, rather than running the " "package's rules clean target." msgstr "" #. type: Plain text -#: ../dgit.1:577 +#: ../dgit.1:579 msgid "" "This will delete all files which are not tracked by git. (Including any " "files you forgot to git add.)" msgstr "" #. type: Plain text -#: ../dgit.1:582 +#: ../dgit.1:584 msgid "" "B<--clean=>I<...> options other than dpkg-source are useful when the " "package's clean target is troublesome, or to avoid needing the build-" @@ -1140,7 +1143,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:589 +#: ../dgit.1:591 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 it " @@ -1149,13 +1152,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:589 +#: ../dgit.1:591 #, no-wrap msgid "B<--clean=git-ff> | B<-wgf>" msgstr "" #. type: Plain text -#: ../dgit.1:598 +#: ../dgit.1:600 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 " @@ -1163,33 +1166,33 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:598 +#: ../dgit.1:600 #, no-wrap msgid "B<--clean=git>[B<-ff>]B<,always> | B<-wga> | B<-wgfa>" msgstr "" #. type: Plain text -#: ../dgit.1:602 +#: ../dgit.1:604 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:602 +#: ../dgit.1:604 #, no-wrap msgid "B<--clean=check> | B<--clean=check,ignores> | B<-wc> | B<-wci>" msgstr "" #. type: Plain text -#: ../dgit.1:608 +#: ../dgit.1:610 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:619 +#: ../dgit.1:621 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 " @@ -1197,13 +1200,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:619 +#: ../dgit.1:621 #, no-wrap msgid "B<--clean=none> | B<-wn>" msgstr "" #. type: Plain text -#: ../dgit.1:627 +#: ../dgit.1:629 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 " @@ -1212,13 +1215,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:627 +#: ../dgit.1:629 #, no-wrap msgid "B<--clean=dpkg-source>[B<-d>] | B<-wd> | B<-wdd>" msgstr "" #. type: Plain text -#: ../dgit.1:632 +#: ../dgit.1:634 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 " @@ -1226,12 +1229,12 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:636 +#: ../dgit.1:638 msgid "Without the extra B<d>, requires the package's build dependencies." msgstr "" #. type: Plain text -#: ../dgit.1:646 +#: ../dgit.1:648 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 " @@ -1239,7 +1242,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:653 +#: ../dgit.1:655 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 " @@ -1248,7 +1251,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:663 +#: ../dgit.1:665 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 " @@ -1259,38 +1262,38 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:663 +#: ../dgit.1:665 #, no-wrap msgid "B<--clean=dpkg-source>[B<-d>]B<,no-check> | B<-wdn> | B<-wddn>" msgstr "" #. type: Plain text -#: ../dgit.1:667 +#: ../dgit.1:669 msgid "" "Like --clean=dpkg-source, but does not care about untracked un-ignored files." msgstr "" #. type: TP -#: ../dgit.1:667 +#: ../dgit.1:669 #, no-wrap msgid "B<--clean=dpkg-source>[B<-d>]B<,all-check> | B<-wda> | B<-wdda>" msgstr "" #. type: Plain text -#: ../dgit.1:672 +#: ../dgit.1:674 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:672 +#: ../dgit.1:674 #, no-wrap msgid "B<-N> | B<--new>" msgstr "" #. type: Plain text -#: ../dgit.1:678 +#: ../dgit.1:680 msgid "" "The package is, or may be, new in this suite. Without this, dgit will " "refuse to push. Needing --new is not unusual; for example, it is frequently " @@ -1298,7 +1301,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:684 +#: ../dgit.1:686 msgid "" "Note that dgit may be unable to access the git history for an entirely new " "package which has not been accepted by the archive. So for an entirely new " @@ -1306,13 +1309,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:684 +#: ../dgit.1:686 #, no-wrap msgid "B<--include-dirty>" msgstr "" #. type: Plain text -#: ../dgit.1:692 +#: ../dgit.1:694 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 " @@ -1322,7 +1325,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:704 +#: ../dgit.1:706 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 " @@ -1333,24 +1336,24 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:704 +#: ../dgit.1:706 #, no-wrap msgid "B<--ignore-dirty>" msgstr "" #. type: Plain text -#: ../dgit.1:707 +#: ../dgit.1:709 msgid "Deprecated alias for --include-dirty." msgstr "" #. type: TP -#: ../dgit.1:707 +#: ../dgit.1:709 #, no-wrap msgid "B<--overwrite>[=I<previous-version>]" msgstr "" #. type: Plain text -#: ../dgit.1:718 +#: ../dgit.1:720 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-" @@ -1359,14 +1362,14 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:725 +#: ../dgit.1:727 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:731 +#: ../dgit.1:733 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 " @@ -1375,14 +1378,14 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:737 +#: ../dgit.1:739 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:751 +#: ../dgit.1:753 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 " @@ -1393,7 +1396,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:757 +#: ../dgit.1:759 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 " @@ -1402,26 +1405,27 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:762 +#: ../dgit.1:766 msgid "" "(In quilt mode B<gbp>, B<dpm>, B<unpatched> or B<baredebian>*, implying a " "split between the dgit view and the maintainer view, the pseudo-merge will " -"appear only in the dgit view.)" +"appear only in the dgit view; B<--split-view=always> can be used to force " +"that behaviour, e.g. in other quilt modes.)" msgstr "" #. type: TP -#: ../dgit.1:762 +#: ../dgit.1:766 #, no-wrap msgid "B<--delayed>=I<days>" msgstr "" #. type: Plain text -#: ../dgit.1:765 +#: ../dgit.1:769 msgid "Upload to a DELAYED queue." msgstr "" #. type: Plain text -#: ../dgit.1:775 +#: ../dgit.1:779 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 " @@ -1431,27 +1435,27 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:780 +#: ../dgit.1:784 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:780 +#: ../dgit.1:784 #, no-wrap msgid "B<--no-chase-dsc-distro>" msgstr "" #. type: Plain text -#: ../dgit.1:786 +#: ../dgit.1:790 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:796 +#: ../dgit.1:800 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 " @@ -1460,7 +1464,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:804 +#: ../dgit.1:808 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 " @@ -1469,13 +1473,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:804 +#: ../dgit.1:808 #, no-wrap msgid "B<--save-dgit-view=>I<branch>|I<ref>" msgstr "" #. type: Plain text -#: ../dgit.1:814 +#: ../dgit.1:818 msgid "" "Specifies that when split view is in operation, and dgit calculates (or " "looks up in its cache) a dgit view corresponding to your HEAD, the dgit " @@ -1484,7 +1488,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:818 +#: ../dgit.1:822 msgid "" "This option is effective only with the following operations: quilt-fixup; " "push; all builds. And it is only effective when split view is actually in " @@ -1492,25 +1496,25 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:822 +#: ../dgit.1:826 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:826 +#: ../dgit.1:830 msgid "B<--dgit-view-save> is a deprecated alias for --save-dgit-view." msgstr "" #. type: TP -#: ../dgit.1:826 +#: ../dgit.1:830 #, no-wrap msgid "B<--deliberately->I<something>" msgstr "" #. type: Plain text -#: ../dgit.1:840 +#: ../dgit.1:844 msgid "" "Declare that you are deliberately doing I<something>. This can be used to " "override safety catches, including safety catches which relate to distro-" @@ -1522,13 +1526,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:840 +#: ../dgit.1:844 #, no-wrap msgid "B<--deliberately-not-fast-forward>" msgstr "" #. type: Plain text -#: ../dgit.1:846 +#: ../dgit.1:850 msgid "" "Declare that you are deliberately rewriting history. This could be because " "your branch is not fast forward from the dgit server history, or not fast " @@ -1536,7 +1540,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:852 +#: ../dgit.1:856 msgid "" "When pushing to Debian, use this only when you are making a renewed upload " "of an entirely new source package whose previous version was not accepted " @@ -1545,7 +1549,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:863 +#: ../dgit.1:867 msgid "" "When split view is in operation, this also prevents the construction by dgit " "of a pseudomerge to make the dgit view fast forwarding. Normally only one " @@ -1555,13 +1559,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:863 +#: ../dgit.1:867 #, no-wrap msgid "B<--deliberately-include-questionable-history>" msgstr "" #. type: Plain text -#: ../dgit.1:872 +#: ../dgit.1:876 msgid "" "Declare that you are deliberately including, in the git history of your " "current push, history which contains a previously-submitted version of this " @@ -1573,13 +1577,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:872 +#: ../dgit.1:876 #, no-wrap msgid "B<--deliberately-fresh-repo>" msgstr "" #. type: Plain text -#: ../dgit.1:877 +#: ../dgit.1:881 msgid "" "Declare that you are deliberately rewriting history and want to throw away " "the existing repo. Not relevant when pushing to Debian, as the Debian " @@ -1587,13 +1591,13 @@ msgid "" msgstr "" #. type: =item -#: ../dgit.1:877 ../git-debpush.1.pod:114 +#: ../dgit.1:881 ../git-debpush.1.pod:114 #, no-wrap msgid "B<--quilt=linear>" msgstr "" #. type: Plain text -#: ../dgit.1:884 +#: ../dgit.1:888 msgid "" "With format `3.0 (quilt)', insist on a linear patch stack: one new patch for " "each relevant commit. If such a stack cannot be generated, fail. This is " @@ -1601,20 +1605,20 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:889 +#: ../dgit.1:893 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:889 +#: ../dgit.1:893 #, no-wrap msgid "B<--quilt=try-linear>" msgstr "" #. type: Plain text -#: ../dgit.1:899 +#: ../dgit.1:903 msgid "" "With format `3.0 (quilt)', prefer a linear patch stack (as with --" "quilt=linear) but if that doesn't seem possible, try to generate a single " @@ -1623,13 +1627,13 @@ msgid "" msgstr "" #. type: =item -#: ../dgit.1:899 ../git-debpush.1.pod:120 +#: ../dgit.1:903 ../git-debpush.1.pod:120 #, no-wrap msgid "B<--quilt=smash>" msgstr "" #. type: Plain text -#: ../dgit.1:905 +#: ../dgit.1:909 msgid "" "With format `3.0 (quilt)', assume patches-applied (as obtained from dgit " "clone) and generate a single additional patch for all the changes made in " @@ -1637,7 +1641,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:911 +#: ../dgit.1:915 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 " @@ -1646,13 +1650,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:911 +#: ../dgit.1:915 #, no-wrap msgid "B<--quilt=single>" msgstr "" #. type: Plain text -#: ../dgit.1:918 +#: ../dgit.1:922 msgid "" "With format `3.0 (quilt)', assume patches-applied (as obtained from dgit " "clone), delete all the existing patches, and then generate a single patch " @@ -1661,7 +1665,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:927 +#: ../dgit.1:931 msgid "" "Use this instead of the B<single-debian-patch> dpkg-source format option. " "That dpkg-source option cannot handle certain changes to the tree that dpkg-" @@ -1671,13 +1675,13 @@ msgid "" msgstr "" #. type: =item -#: ../dgit.1:927 ../git-debpush.1.pod:131 +#: ../dgit.1:931 ../git-debpush.1.pod:131 #, no-wrap msgid "B<--quilt=nofix>" msgstr "" #. type: Plain text -#: ../dgit.1:937 +#: ../dgit.1:941 msgid "" "With format `3.0 (quilt)', assume patches-applied (as obtained from dgit " "clone), and check that the patch metadata is up to date. If it isn't, fail; " @@ -1687,13 +1691,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:937 +#: ../dgit.1:941 #, no-wrap msgid "B<--quilt=nocheck> | B<--no-quilt-fixup>" msgstr "" #. type: Plain text -#: ../dgit.1:944 +#: ../dgit.1:948 msgid "" "With format `3.0 (quilt)', assume that the tree is patches-applied (as " "obtained from dgit clone), and I<assume> that the patch metadata is up to " @@ -1702,27 +1706,27 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:944 +#: ../dgit.1:948 #, no-wrap msgid "B<-->[B<quilt=>]B<gbp> | B<-->[B<quilt=>]B<dpm> | B<--quilt=unapplied> | B<-->[B<quilt=>]B<baredebian>[B<+git>|B<+tarball>]" msgstr "" #. type: Plain text -#: ../dgit.1:951 +#: ../dgit.1:955 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:955 +#: ../dgit.1:959 msgid "" "These quilt modes are known as B<splitting quilt modes>. See --split-view, " "below." msgstr "" #. type: Plain text -#: ../dgit.1:963 +#: ../dgit.1:967 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 " @@ -1731,7 +1735,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:971 +#: ../dgit.1:975 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 " @@ -1739,7 +1743,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:976 +#: ../dgit.1:980 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 " @@ -1747,7 +1751,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:990 +#: ../dgit.1:994 msgid "" "B<--quilt=baredebian> (or its alias B<--quilt=baredebian+git>) specifies " "that your HEAD contains only a debian/ directory, with any changes to " @@ -1759,7 +1763,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1001 +#: ../dgit.1:1005 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, " @@ -1770,7 +1774,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1019 +#: ../dgit.1:1023 msgid "" "With --quilt=gbp|dpm|unapplied|baredebian*, dgit push (or precursors like " "quilt-fixup and build) will automatically generate a conversion of your git " @@ -1784,7 +1788,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1028 +#: ../dgit.1:1032 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 " @@ -1796,13 +1800,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1028 +#: ../dgit.1:1032 #, no-wrap msgid "B<-d>I<distro> | B<--distro=>I<distro>" msgstr "" #. type: Plain text -#: ../dgit.1:1037 +#: ../dgit.1:1041 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-" @@ -1812,7 +1816,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1043 +#: ../dgit.1:1047 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 " @@ -1821,7 +1825,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1048 +#: ../dgit.1:1052 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 " @@ -1829,20 +1833,20 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1048 +#: ../dgit.1:1052 #, no-wrap msgid "B<--split-view=auto>|B<always>|B<never>" msgstr "" #. type: Plain text -#: ../dgit.1:1053 +#: ../dgit.1:1057 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:1061 +#: ../dgit.1:1065 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 " @@ -1852,7 +1856,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1067 +#: ../dgit.1:1071 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: " @@ -1860,18 +1864,18 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1070 +#: ../dgit.1:1074 msgid "" "B<always> splits the view regardless of the source format and the quilt mode." msgstr "" #. type: Plain text -#: ../dgit.1:1073 +#: ../dgit.1:1077 msgid "B<never> will cause dgit to fail if split view is needed." msgstr "" #. type: Plain text -#: ../dgit.1:1081 +#: ../dgit.1:1085 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/" @@ -1879,20 +1883,20 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1084 +#: ../dgit.1:1088 msgid "" "Note that split view does not affect dgit fetch, and is not compatible with " "dgit pull." msgstr "" #. type: TP -#: ../dgit.1:1084 +#: ../dgit.1:1088 #, no-wrap msgid "B<-C>I<changesfile>" msgstr "" #. type: Plain text -#: ../dgit.1:1089 +#: ../dgit.1:1093 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 " @@ -1900,7 +1904,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1098 +#: ../dgit.1:1102 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 " @@ -1908,13 +1912,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1098 +#: ../dgit.1:1102 #, no-wrap msgid "B<--upstream-commitish=>I<upstream>" msgstr "" #. type: Plain text -#: ../dgit.1:1106 +#: ../dgit.1:1110 msgid "" "For use with --quilt=baredebian only. Specifies the commit containing the " "upstream source. This commit must be identical to your .orig tarball. The " @@ -1923,13 +1927,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1106 +#: ../dgit.1:1110 #, no-wrap msgid "B<--rm-old-changes>" msgstr "" #. type: Plain text -#: ../dgit.1:1118 +#: ../dgit.1:1122 msgid "" "When doing a build, delete any changes files matching " "I<package>B<_>I<version>B<_*.changes> before starting. This ensures that " @@ -1941,32 +1945,32 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1121 +#: ../dgit.1:1125 msgid "" "Note that B<dgit push-source> will always find the right .changes, " "regardless of this option." msgstr "" #. type: TP -#: ../dgit.1:1121 +#: ../dgit.1:1125 #, no-wrap msgid "B<--build-products-dir=>I<directory>" msgstr "" #. type: Plain text -#: ../dgit.1:1125 +#: ../dgit.1:1129 msgid "" "Specifies where to find and create tarballs, binary packages, source " "packages, .changes files, and so on." msgstr "" #. type: Plain text -#: ../dgit.1:1128 +#: ../dgit.1:1132 msgid "By default, dgit uses the parent directory (B<..>)." msgstr "" #. type: Plain text -#: ../dgit.1:1137 +#: ../dgit.1:1141 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-" @@ -1975,85 +1979,85 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1137 +#: ../dgit.1:1141 #, no-wrap msgid "B<--no-rm-on-error>" msgstr "" #. type: Plain text -#: ../dgit.1:1140 +#: ../dgit.1:1144 msgid "Do not delete the destination directory if clone fails." msgstr "" #. type: TP -#: ../dgit.1:1140 +#: ../dgit.1:1144 #, no-wrap msgid "B<--dep14tag>" msgstr "" #. type: Plain text -#: ../dgit.1:1147 +#: ../dgit.1:1151 msgid "" "Generates a DEP-14 tag (eg B<debian/>I<version>) as well as a dgit tag (eg " "B<archive/debian/>I<version>). This is the default." msgstr "" #. type: TP -#: ../dgit.1:1147 +#: ../dgit.1:1151 #, no-wrap msgid "B<--no-dep14tag>" msgstr "" #. type: Plain text -#: ../dgit.1:1150 +#: ../dgit.1:1154 msgid "Do not generate a DEP-14 tag, except when split view is in operation." msgstr "" #. type: TP -#: ../dgit.1:1150 +#: ../dgit.1:1154 #, no-wrap msgid "B<--always-dep14tag>" msgstr "" #. type: Plain text -#: ../dgit.1:1153 +#: ../dgit.1:1157 msgid "Obsolete alias for --dep14tag, retained for compatibility." msgstr "" #. type: TP -#: ../dgit.1:1153 +#: ../dgit.1:1157 #, no-wrap msgid "B<-D>" msgstr "" #. type: Plain text -#: ../dgit.1:1157 +#: ../dgit.1:1161 msgid "" "Prints debugging information to stderr. Repeating the option produces more " "output (currently, up to -DDDD is meaningfully different)." msgstr "" #. type: TP -#: ../dgit.1:1157 +#: ../dgit.1:1161 #, no-wrap msgid "B<-c>I<name>B<=>I<value>" msgstr "" #. type: Plain text -#: ../dgit.1:1161 +#: ../dgit.1:1165 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:1161 +#: ../dgit.1:1165 #, no-wrap msgid "B<-v>I<version>|B<_> | B<--since-version=>versionI<|>B<_>" msgstr "" #. type: Plain text -#: ../dgit.1:1170 +#: ../dgit.1:1174 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 " @@ -2063,7 +2067,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1176 +#: ../dgit.1:1180 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 " @@ -2071,30 +2075,30 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1176 +#: ../dgit.1:1180 #, no-wrap msgid "B<-m>I<maintaineraddress>" msgstr "" #. type: Plain text -#: ../dgit.1:1179 +#: ../dgit.1:1183 msgid "Passed to dpkg-genchanges (eventually)." msgstr "" #. type: TP -#: ../dgit.1:1179 +#: ../dgit.1:1183 #, no-wrap msgid "B<--ch:>I<option>" msgstr "" #. type: Plain text -#: ../dgit.1:1183 +#: ../dgit.1:1187 msgid "" "Specifies a single additional option to pass, eventually, to dpkg-genchanges." msgstr "" #. type: Plain text -#: ../dgit.1:1190 +#: ../dgit.1:1194 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 " @@ -2102,18 +2106,18 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1192 +#: ../dgit.1:1196 msgid "For other options the caveat below applies." msgstr "" #. type: TP -#: ../dgit.1:1192 +#: ../dgit.1:1196 #, no-wrap msgid "B<--curl:>I<option> | B<--dput:>I<option> |..." msgstr "" #. type: Plain text -#: ../dgit.1:1214 +#: ../dgit.1:1218 msgid "" "Specifies a single additional option to pass to B<curl>, B<dput>, " "B<debsign>, B<dpkg-source>, B<dpkg-buildpackage>, B<dpkg-genchanges>, " @@ -2123,7 +2127,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1222 +#: ../dgit.1:1226 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, " @@ -2132,7 +2136,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1227 +#: ../dgit.1:1231 msgid "" "For dpkg-buildpackage, dpkg-genchanges, mergechanges and sbuild, the option " "applies only when the program is invoked directly by dgit. Usually, for " @@ -2140,7 +2144,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1231 +#: ../dgit.1:1235 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 " @@ -2148,39 +2152,39 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1233 +#: ../dgit.1:1237 msgid "See notes below regarding ssh and dgit." msgstr "" #. type: Plain text -#: ../dgit.1:1241 +#: ../dgit.1:1245 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:1241 +#: ../dgit.1:1245 #, no-wrap msgid "B<--curl!:>I<option> | B<--dput!:>I<option> |..." msgstr "" #. type: Plain text -#: ../dgit.1:1247 +#: ../dgit.1:1251 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:1252 +#: ../dgit.1:1256 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:1259 +#: ../dgit.1:1263 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 " @@ -2188,13 +2192,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1259 +#: ../dgit.1:1263 #, no-wrap msgid "B<--curl=>I<program> | B<--dput=>I<program> |..." msgstr "" #. type: Plain text -#: ../dgit.1:1282 +#: ../dgit.1:1286 msgid "" "Specifies alternative programs to use instead of B<curl>, B<dput>, " "B<debsign>, B<dpkg-source>, B<dpkg-buildpackage>, B<dpkg-genchanges>, " @@ -2204,14 +2208,14 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1290 +#: ../dgit.1:1294 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:1297 +#: ../dgit.1:1301 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 " @@ -2220,7 +2224,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1308 +#: ../dgit.1:1312 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 " @@ -2230,7 +2234,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1316 +#: ../dgit.1:1320 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 " @@ -2238,7 +2242,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1333 +#: ../dgit.1:1337 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 " @@ -2250,13 +2254,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1333 +#: ../dgit.1:1337 #, no-wrap msgid "B<--existing-package=>I<package>" msgstr "" #. type: Plain text -#: ../dgit.1:1343 +#: ../dgit.1:1347 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 " @@ -2267,19 +2271,19 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1343 +#: ../dgit.1:1347 #, no-wrap msgid "B<-h>|B<--help>" msgstr "" #. type: TP -#: ../dgit.1:1346 +#: ../dgit.1:1350 #, no-wrap msgid "B<--initiator-tempdir=>I<directory>" msgstr "" #. type: Plain text -#: ../dgit.1:1355 +#: ../dgit.1:1359 msgid "" "dgit rpush uses a temporary directory on the invoking (signing) host. This " "option causes dgit to use I<directory> instead. Furthermore, the specified " @@ -2289,13 +2293,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1355 +#: ../dgit.1:1359 #, no-wrap msgid "B<--dry-run> | B<-n>" msgstr "" #. type: Plain text -#: ../dgit.1:1361 +#: ../dgit.1:1365 msgid "" "Go through the motions, fetching all information needed, but do not actually " "update the output(s). For push, dgit does the required checks and leaves " @@ -2303,27 +2307,27 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1364 +#: ../dgit.1:1368 msgid "" "This is not a very good simulation. It can easily go wrong in ways that a " "for-real push wouldn't." msgstr "" #. type: TP -#: ../dgit.1:1364 +#: ../dgit.1:1368 #, no-wrap msgid "B<--damp-run> | B<-L>" msgstr "" #. type: Plain text -#: ../dgit.1:1369 +#: ../dgit.1:1373 msgid "" "Go through many more of the motions: do everything that doesn't involve " "either signing things, or making changes on the public servers." msgstr "" #. type: Plain text -#: ../dgit.1:1374 +#: ../dgit.1:1378 msgid "" "Using this will make unsigned tags, and possibly other local changes, that " "will get in the way of a for-real push. So be prepared to burn the version " @@ -2331,13 +2335,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1374 +#: ../dgit.1:1378 #, no-wrap msgid "B<--force->I<something>" msgstr "" #. type: Plain text -#: ../dgit.1:1382 +#: ../dgit.1:1386 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 " @@ -2346,13 +2350,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1382 +#: ../dgit.1:1386 #, no-wrap msgid "B<--force-import-dsc-with-dgit-field>" msgstr "" #. type: Plain text -#: ../dgit.1:1389 +#: ../dgit.1:1393 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 " @@ -2360,13 +2364,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1389 +#: ../dgit.1:1393 #, no-wrap msgid "B<--force-reusing-version>" msgstr "" #. type: Plain text -#: ../dgit.1:1396 +#: ../dgit.1:1400 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 " @@ -2375,26 +2379,26 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1396 +#: ../dgit.1:1400 #, no-wrap msgid "B<--force-uploading-binaries>" msgstr "" #. type: Plain text -#: ../dgit.1:1401 +#: ../dgit.1:1405 msgid "" "Carry on and upload binaries even though dgit thinks your distro does not " "permit that." msgstr "" #. type: TP -#: ../dgit.1:1401 +#: ../dgit.1:1405 #, no-wrap msgid "B<--force-uploading-source-only>" msgstr "" #. type: Plain text -#: ../dgit.1:1407 +#: ../dgit.1:1411 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 " @@ -2402,13 +2406,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1407 +#: ../dgit.1:1411 #, no-wrap msgid "B<--force-unrepresentable>" msgstr "" #. type: Plain text -#: ../dgit.1:1414 +#: ../dgit.1:1418 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 " @@ -2416,65 +2420,65 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1414 +#: ../dgit.1:1418 #, no-wrap msgid "B<--force-changes-origs-exactly>" msgstr "" #. type: Plain text -#: ../dgit.1:1419 +#: ../dgit.1:1423 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:1419 +#: ../dgit.1:1423 #, no-wrap msgid "B<--force-unsupported-source-format>" msgstr "" #. type: Plain text -#: ../dgit.1:1423 +#: ../dgit.1:1427 msgid "" "Carry on despite dgit not understanding your source package format. dgit " "will probably mishandle it." msgstr "" #. type: TP -#: ../dgit.1:1423 +#: ../dgit.1:1427 #, no-wrap msgid "B<--force-dsc-changes-mismatch>" msgstr "" #. type: Plain text -#: ../dgit.1:1427 +#: ../dgit.1:1431 msgid "" "Do not check whether .dsc and .changes match. The archive will probably " "reject your upload." msgstr "" #. type: TP -#: ../dgit.1:1427 +#: ../dgit.1:1431 #, no-wrap msgid "B<--force-import-gitapply-absurd> | B<--force-import-gitapply-no-absurd>" msgstr "" #. type: Plain text -#: ../dgit.1:1433 +#: ../dgit.1:1437 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:1433 +#: ../dgit.1:1437 #, no-wrap msgid "B<--force-push-tainted>" msgstr "" #. type: Plain text -#: ../dgit.1:1443 +#: ../dgit.1:1447 msgid "" "Go ahead and try to push even tainted git objects hat the server says it is " "going to reject, but without declaring any --deliberately. This option is " @@ -2484,13 +2488,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1443 +#: ../dgit.1:1447 #, no-wrap msgid "B<--for-push>" msgstr "" #. type: Plain text -#: ../dgit.1:1449 +#: ../dgit.1:1453 msgid "" "Override the dgit-distro.distro.readonly configuration setting, to specify " "that we have read/write access and should use the corresponding git and " @@ -2498,13 +2502,13 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit.1:1449 ../dgit-downstream-dsc.7.pod:150 +#: ../dgit.1:1453 ../dgit-downstream-dsc.7.pod:150 #, no-wrap msgid "CONFIGURATION" msgstr "" #. type: Plain text -#: ../dgit.1:1455 +#: ../dgit.1:1459 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<-" @@ -2512,31 +2516,31 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1457 +#: ../dgit.1:1461 msgid "Settings likely to be useful for an end user include:" msgstr "" #. type: TP -#: ../dgit.1:1457 +#: ../dgit.1:1461 #, no-wrap msgid "B<dgit.default.build-products-dir>" msgstr "" #. type: Plain text -#: ../dgit.1:1463 +#: ../dgit.1:1467 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:1463 ../dgit-downstream-dsc.7.pod:286 +#: ../dgit.1:1467 ../dgit-downstream-dsc.7.pod:286 #, no-wrap msgid "B<dgit-suite.>I<suite>B<.distro> I<distro>" msgstr "" #. type: Plain text -#: ../dgit.1:1468 +#: ../dgit.1:1472 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 " @@ -2544,73 +2548,73 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1471 +#: ../dgit.1:1475 msgid "I<suite> may be a glob pattern." msgstr "" #. type: TP -#: ../dgit.1:1471 +#: ../dgit.1:1475 #, no-wrap msgid "B<dgit.default.distro>I< distro>" msgstr "" #. type: Plain text -#: ../dgit.1:1474 +#: ../dgit.1:1478 msgid "The default distro for an unknown suite." msgstr "" #. type: Plain text -#: ../dgit.1:1478 +#: ../dgit.1:1482 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:1478 +#: ../dgit.1:1482 #, no-wrap msgid "B<dgit.default.default-suite>I< suite>" msgstr "" #. type: Plain text -#: ../dgit.1:1481 +#: ../dgit.1:1485 msgid "The default suite (eg for clone)." msgstr "" #. type: TP -#: ../dgit.1:1481 +#: ../dgit.1:1485 #, no-wrap msgid "B<dgit.default.>*" msgstr "" #. type: Plain text -#: ../dgit.1:1486 +#: ../dgit.1:1490 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:1486 +#: ../dgit.1:1490 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.clean-mode>" msgstr "" #. type: Plain text -#: ../dgit.1:1490 +#: ../dgit.1:1494 msgid "" "One of the values for the command line --clean= option; used if --clean is " "not specified." msgstr "" #. type: TP -#: ../dgit.1:1490 +#: ../dgit.1:1494 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.clean-mode-newer>" msgstr "" #. type: Plain text -#: ../dgit.1:1496 +#: ../dgit.1:1500 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 " @@ -2618,45 +2622,45 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1496 +#: ../dgit.1:1500 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.quilt-mode>" msgstr "" #. type: Plain text -#: ../dgit.1:1500 +#: ../dgit.1:1504 msgid "" "One of the values for the command line --quilt= option; used if --quilt is " "not specified." msgstr "" #. type: TP -#: ../dgit.1:1500 +#: ../dgit.1:1504 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.split-view>" msgstr "" #. type: TP -#: ../dgit.1:1502 +#: ../dgit.1:1506 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.rm-old-changes>" msgstr "" #. type: Plain text -#: ../dgit.1:1506 +#: ../dgit.1:1510 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:1506 +#: ../dgit.1:1510 #, 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:1513 +#: ../dgit.1:1517 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, " @@ -2665,52 +2669,52 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1513 +#: ../dgit.1:1517 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.keyid>" msgstr "" #. type: Plain text -#: ../dgit.1:1517 +#: ../dgit.1:1521 msgid "See also B<-k>." msgstr "" #. type: TP -#: ../dgit.1:1517 +#: ../dgit.1:1521 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.mirror>I< url>" msgstr "" #. type: TP -#: ../dgit.1:1519 +#: ../dgit.1:1523 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.username>" msgstr "" #. type: Plain text -#: ../dgit.1:1522 +#: ../dgit.1:1526 msgid "Not relevant for Debian." msgstr "" #. type: =item -#: ../dgit.1:1522 ../dgit-downstream-dsc.7.pod:242 +#: ../dgit.1:1526 ../dgit-downstream-dsc.7.pod:242 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.upload-host>" msgstr "" #. type: Plain text -#: ../dgit.1:1525 +#: ../dgit.1:1529 msgid "Might be useful if you have an intermediate queue server." msgstr "" #. type: TP -#: ../dgit.1:1525 +#: ../dgit.1:1529 #, 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:1530 +#: ../dgit.1:1534 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, " @@ -2718,26 +2722,26 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1530 +#: ../dgit.1:1534 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.setup-useremail>" msgstr "" #. type: Plain text -#: ../dgit.1:1534 +#: ../dgit.1:1538 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:1534 +#: ../dgit.1:1538 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.setup-mergechangelogs>" msgstr "" #. type: Plain text -#: ../dgit.1:1539 +#: ../dgit.1:1543 msgid "" "Whether to set up a merge driver which uses dpkg-mergechangelogs for debian/" "changelog. True by default. Ignored for dgit setup-mergechangelogs, which " @@ -2745,13 +2749,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1539 +#: ../dgit.1:1543 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.setup-gitattributes>" msgstr "" #. type: Plain text -#: ../dgit.1:1545 +#: ../dgit.1:1549 msgid "" "Whether to configure .git/info/attributes to suppress checkin/checkout file " "content transformations in new git trees. True by default. Ignored for " @@ -2759,24 +2763,24 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1545 +#: ../dgit.1:1549 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.cmd->I<cmd>" msgstr "" #. type: Plain text -#: ../dgit.1:1551 +#: ../dgit.1:1555 msgid "Program to use instead of I<cmd>. Works like B<-->I<cmd>B<=>... ." msgstr "" #. type: TP -#: ../dgit.1:1551 +#: ../dgit.1:1555 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.opts->I<cmd>" msgstr "" #. type: Plain text -#: ../dgit.1:1563 +#: ../dgit.1:1567 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 --" @@ -2786,13 +2790,13 @@ msgid "" msgstr "" #. type: SH -#: ../dgit.1:1563 +#: ../dgit.1:1567 #, no-wrap msgid "ACCESS CONFIGURATION" msgstr "" #. type: Plain text -#: ../dgit.1:1568 +#: ../dgit.1:1572 msgid "" "There are many other settings which specify how a particular distro's " "services (archive and git) are provided. These should not normally be " @@ -2801,215 +2805,215 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1568 +#: ../dgit.1:1572 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.nominal-distro>" msgstr "" #. type: Plain text -#: ../dgit.1:1571 +#: ../dgit.1:1575 msgid "Shown in git tags, Dgit fields, and so on." msgstr "" #. type: TP -#: ../dgit.1:1571 +#: ../dgit.1:1575 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.alias-canon>" msgstr "" #. type: Plain text -#: ../dgit.1:1574 +#: ../dgit.1:1578 msgid "Used for all access configuration lookup." msgstr "" #. type: TP -#: ../dgit.1:1574 +#: ../dgit.1:1578 #, no-wrap msgid "B<dgit-distro.>I<distro>B</push.>*" msgstr "" #. type: Plain text -#: ../dgit.1:1580 +#: ../dgit.1:1584 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:1580 +#: ../dgit.1:1584 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-url>" msgstr "" #. type: TP -#: ../dgit.1:1582 +#: ../dgit.1:1586 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-url>[B<-suffix>]" msgstr "" #. type: TP -#: ../dgit.1:1584 +#: ../dgit.1:1588 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-proto>" msgstr "" #. type: TP -#: ../dgit.1:1586 +#: ../dgit.1:1590 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-path>" msgstr "" #. type: TP -#: ../dgit.1:1588 +#: ../dgit.1:1592 #, 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:1590 +#: ../dgit.1:1594 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-check-suffix>" msgstr "" #. type: TP -#: ../dgit.1:1592 +#: ../dgit.1:1596 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.policy-query-supported-ssh>I< >B<false>I<|>B<unknown>I<|>B<true>" msgstr "" #. type: TP -#: ../dgit.1:1594 +#: ../dgit.1:1598 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.diverts.divert> B<new-distro>|B</>I<distro-suffix>" msgstr "" #. type: TP -#: ../dgit.1:1596 +#: ../dgit.1:1600 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-create>I< >B<ssh-cmd>I<|>B<true>" msgstr "" #. type: TP -#: ../dgit.1:1598 +#: ../dgit.1:1602 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.archive-query> B<ftpmasterapi:> | B<madison:>I<distro> | B<dummycat:>I</path> | B<sshpsql:>I<user>B<@>I<host>B<:>I<dbname>B< >|B< aptget:>" msgstr "" #. type: TP -#: ../dgit.1:1600 +#: ../dgit.1:1604 #, 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:1602 +#: ../dgit.1:1606 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.madison-distro>" msgstr "" #. type: TP -#: ../dgit.1:1604 +#: ../dgit.1:1608 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.archive-query-default-component>" msgstr "" #. type: TP -#: ../dgit.1:1606 +#: ../dgit.1:1610 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.dep14tag> B<want>|B<no>[|B<always>]" msgstr "" #. type: TP -#: ../dgit.1:1608 +#: ../dgit.1:1612 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.ssh>" msgstr "" #. type: TP -#: ../dgit.1:1610 +#: ../dgit.1:1614 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.sshpsql-dbname>" msgstr "" #. type: TP -#: ../dgit.1:1612 +#: ../dgit.1:1616 #, 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:1614 +#: ../dgit.1:1618 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.backports-quirk>" msgstr "" #. type: TP -#: ../dgit.1:1616 +#: ../dgit.1:1620 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.rewrite-map-enable>" msgstr "" #. type: TP -#: ../dgit.1:1618 +#: ../dgit.1:1622 #, 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:1620 +#: ../dgit.1:1624 #, no-wrap msgid "B<dgit.default.old-dsc-distro>" msgstr "" #. type: TP -#: ../dgit.1:1622 +#: ../dgit.1:1626 #, no-wrap msgid "B<dgit.dsc-url-proto-ok.>I<protocol>" msgstr "" #. type: TP -#: ../dgit.1:1624 +#: ../dgit.1:1628 #, no-wrap msgid "B<dgit.dsc-url-proto-ok.bad-syntax>" msgstr "" #. type: TP -#: ../dgit.1:1626 +#: ../dgit.1:1630 #, no-wrap msgid "B<dgit.default.dsc-url-proto-ok>" msgstr "" #. type: TP -#: ../dgit.1:1628 +#: ../dgit.1:1632 #, no-wrap msgid "B<dgit.default.push-subcmd>I< >B<source>I<|>B<built>I<|>B<warn,built>" msgstr "" #. type: Plain text -#: ../dgit.1:1632 +#: ../dgit.1:1636 msgid "Controls the behaviour of B<dgit push>." msgstr "" #. type: TP -#: ../dgit.1:1632 +#: ../dgit.1:1636 #, no-wrap msgid "B<dgit.vcs-git.suites> I<suite>[B<;>...]" msgstr "" #. type: SH -#: ../dgit.1:1634 +#: ../dgit.1:1638 #, no-wrap msgid "ENVIRONMENT VARIABLES" msgstr "" #. type: TP -#: ../dgit.1:1635 +#: ../dgit.1:1639 #, no-wrap msgid "B<DGIT_SSH>, B<GIT_SSH>" msgstr "" #. type: Plain text -#: ../dgit.1:1644 +#: ../dgit.1:1648 msgid "" "specify an alternative default program (and perhaps arguments) to use " "instead of ssh. DGIT_SSH is consulted first and may contain arguments; if " @@ -3019,26 +3023,26 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1644 +#: ../dgit.1:1648 #, no-wrap msgid "B<DEBEMAIL>, B<DEBFULLNAME>" msgstr "" #. type: Plain text -#: ../dgit.1:1648 +#: ../dgit.1:1652 msgid "" "Default git user.email and user.name for new trees. See B<dgit setup-new-" "tree>." msgstr "" #. type: TP -#: ../dgit.1:1648 +#: ../dgit.1:1652 #, no-wrap msgid "B<gpg>, B<dpkg->..., B<debsign>, B<git>, [B<lib>]B<curl>, B<dput>" msgstr "" #. type: Plain text -#: ../dgit.1:1653 +#: ../dgit.1:1657 msgid "" "and other subprograms and modules used by dgit are affected by various " "environment variables. Consult the documentation for those programs for " @@ -3046,13 +3050,13 @@ msgid "" msgstr "" #. type: SH -#: ../dgit.1:1653 +#: ../dgit.1:1657 #, no-wrap msgid "BUGS" msgstr "" #. type: Plain text -#: ../dgit.1:1660 +#: ../dgit.1:1664 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 " @@ -3060,7 +3064,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1666 +#: ../dgit.1:1670 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 " @@ -3068,7 +3072,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1671 +#: ../dgit.1:1675 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 " @@ -3077,7 +3081,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1676 +#: ../dgit.1:1680 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-" @@ -3085,25 +3089,25 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit.1:1676 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit.1:1680 ../dgit.7:23 ../dgit-user.7.pod:447 #: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:125 -#: ../dgit-maint-merge.7.pod:547 ../dgit-maint-gbp.7.pod:139 +#: ../dgit-maint-merge.7.pod:509 ../dgit-maint-gbp.7.pod:139 #: ../dgit-maint-debrebase.7.pod:792 ../dgit-downstream-dsc.7.pod:352 #: ../dgit-sponsorship.7.pod:322 ../dgit-maint-bpo.7.pod:140 -#: ../git-debrebase.1.pod:637 ../git-debrebase.5.pod:678 +#: ../git-debrebase.1.pod:643 ../git-debrebase.5.pod:678 #: ../git-debpush.1.pod:261 #, no-wrap msgid "SEE ALSO" msgstr "" #. type: Plain text -#: ../dgit.1:1685 +#: ../dgit.1:1689 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:1686 +#: ../dgit.1:1690 msgid "https://browse.dgit.debian.org/" msgstr "" diff --git a/po4a/git-debrebase_1.pot b/po4a/git-debrebase_1.pot index 5b9c051..6e1d42f 100644 --- a/po4a/git-debrebase_1.pot +++ b/po4a/git-debrebase_1.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2022-12-29 11:56+0000\n" +"POT-Creation-Date: 2023-10-29 17:49+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -28,18 +28,18 @@ msgid "NAME" msgstr "" #. type: =head1 -#: ../dgit.1:548 ../git-debrebase.1.pod:477 +#: ../dgit.1:550 ../git-debrebase.1.pod:473 #, no-wrap msgid "OPTIONS" msgstr "" #. type: =head1 -#: ../dgit.1:1676 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit.1:1680 ../dgit.7:23 ../dgit-user.7.pod:447 #: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:125 -#: ../dgit-maint-merge.7.pod:547 ../dgit-maint-gbp.7.pod:139 +#: ../dgit-maint-merge.7.pod:509 ../dgit-maint-gbp.7.pod:139 #: ../dgit-maint-debrebase.7.pod:792 ../dgit-downstream-dsc.7.pod:352 #: ../dgit-sponsorship.7.pod:322 ../dgit-maint-bpo.7.pod:140 -#: ../git-debrebase.1.pod:647 ../git-debrebase.5.pod:678 +#: ../git-debrebase.1.pod:643 ../git-debrebase.5.pod:678 #: ../git-debpush.1.pod:261 #, no-wrap msgid "SEE ALSO" @@ -98,17 +98,24 @@ msgstr "" #. type: textblock #: ../git-debrebase.1.pod:24 msgid "" +"When sharing branches, you should usually share a fast-forwarding branch " +"(ie, use C<git-debrebase conclude> (or C<prepush>) before pushing." +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:27 +msgid "" "git-debrebase has a special branch format, so see \"CONVERTING AN EXISTING " "PACKAGE\" in L<dgit-maint-debrebase(7)>." msgstr "" #. type: =head1 -#: ../git-debrebase.1.pod:27 +#: ../git-debrebase.1.pod:30 msgid "GUIDE TO DOCUMENTATION" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:29 +#: ../git-debrebase.1.pod:32 msgid "" "This is the command line reference. There is also a detailed workflow " "tutorial at L<dgit-maint-debrebase(7)> (on which the above \"QUICK REFERENCE" @@ -117,43 +124,43 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:36 +#: ../git-debrebase.1.pod:39 msgid "" "You should read this manpage in conjunction with L<git-debrebase(5)/" "TERMINOLOGY>, which defines many important terms used here." msgstr "" #. type: =head1 -#: ../git-debrebase.1.pod:40 +#: ../git-debrebase.1.pod:43 msgid "PRINCIPAL OPERATIONS" msgstr "" #. type: =item -#: ../git-debrebase.1.pod:44 +#: ../git-debrebase.1.pod:47 msgid "git-debrebase [-- <git-rebase options...>]" msgstr "" #. type: =item -#: ../git-debrebase.1.pod:46 +#: ../git-debrebase.1.pod:49 msgid "git-debrebase [-i <further git-rebase options...>]" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:48 +#: ../git-debrebase.1.pod:51 msgid "" "Unstitches and launders the branch. (See L</UNSTITCHING AND LAUNDERING> " "below.)" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:51 +#: ../git-debrebase.1.pod:54 msgid "" "Then, if any git-rebase options were supplied, edits the Debian delta queue, " "using git-rebase, by running" msgstr "" #. type: verbatim -#: ../git-debrebase.1.pod:55 +#: ../git-debrebase.1.pod:58 #, no-wrap msgid "" " git rebase <git-rebase options> <breakwater-tip>\n" @@ -161,7 +168,7 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:57 +#: ../git-debrebase.1.pod:60 msgid "" "Do not pass a base branch argument: git-debrebase will supply that. Do not " "use --onto, or --fork-point. Useful git-rebase options include -i and --" @@ -169,7 +176,7 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:62 +#: ../git-debrebase.1.pod:65 msgid "" "If git-rebase stops for any reason, you may git-rebase --abort, --continue, " "or --skip, as usual. If you abort the git-rebase, the branch will still " @@ -177,14 +184,14 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:68 +#: ../git-debrebase.1.pod:71 msgid "" "The options for git-rebase must either start with C<-i>, or be prececded by " "C<-->, to distinguish them from options for git-debrebase." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:72 +#: ../git-debrebase.1.pod:75 msgid "" "It is hazardous to use plain git-rebase on a git-debrebase branch, because " "git-rebase has a tendency to start the rebase too far back in history, and " @@ -192,19 +199,19 @@ msgid "" msgstr "" #. type: =item -#: ../git-debrebase.1.pod:78 +#: ../git-debrebase.1.pod:81 msgid "git-debrebase status" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:80 +#: ../git-debrebase.1.pod:83 msgid "" "Analyses the current branch, both in terms of its contents, and the refs " "which are relevant to git-debrebase, and prints a human-readable summary." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:85 +#: ../git-debrebase.1.pod:88 msgid "" "Please do not attempt to parse the output; it may be reformatted or " "reorganised in the future. Instead, use one of the L<UNDERLYING AND " @@ -212,109 +219,109 @@ msgid "" msgstr "" #. type: =item -#: ../git-debrebase.1.pod:91 +#: ../git-debrebase.1.pod:94 msgid "git-debrebase conclude" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:93 +#: ../git-debrebase.1.pod:96 msgid "" "Finishes a git-debrebase session, tidying up the branch and making it fast " "forward again." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:96 +#: ../git-debrebase.1.pod:99 msgid "" "Specifically: if the branch is unstitched, launders and restitches it, " "making a new pseudomerge. Otherwise, it is an error, unless --noop-ok." msgstr "" #. type: =item -#: ../git-debrebase.1.pod:102 +#: ../git-debrebase.1.pod:105 msgid "git-debrebase quick" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:104 +#: ../git-debrebase.1.pod:107 msgid "" "Unconditionally launders and restitches the branch, consuming any ffq-prev " "and making a new pseudomerge." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:108 +#: ../git-debrebase.1.pod:111 msgid "If the branch is already laundered and stitched, does nothing." msgstr "" #. type: =item -#: ../git-debrebase.1.pod:110 +#: ../git-debrebase.1.pod:113 msgid "git-debrebase prepush [--prose=<for commit message>]" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:112 +#: ../git-debrebase.1.pod:115 msgid "If the branch is unstitched, stitches it, consuming ffq-prev." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:116 +#: ../git-debrebase.1.pod:119 msgid "" "This is a good command to run before pushing to a git server. You should " "consider using B<conclude> instead, because that launders the branch too." msgstr "" #. type: =item -#: ../git-debrebase.1.pod:120 +#: ../git-debrebase.1.pod:123 msgid "git-debrebase stitch [--prose=<for commit message>]" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:122 +#: ../git-debrebase.1.pod:125 msgid "Stitches the branch, consuming ffq-prev." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:125 +#: ../git-debrebase.1.pod:128 msgid "If there is no ffq-prev, it is an error, unless --noop-ok." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:127 +#: ../git-debrebase.1.pod:130 msgid "You should consider using B<prepush> or B<conclude> instead." msgstr "" #. type: =item -#: ../git-debrebase.1.pod:129 +#: ../git-debrebase.1.pod:132 msgid "git-debrebase scrap" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:131 +#: ../git-debrebase.1.pod:134 msgid "" "Throws away all the work since the branch was last stitched. This is done " "by resetting you to ffq-prev and discarding all working tree changes." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:135 +#: ../git-debrebase.1.pod:138 msgid "If you are in the middle of a git-rebase, will abort that too." msgstr "" #. type: =item -#: ../git-debrebase.1.pod:137 +#: ../git-debrebase.1.pod:140 msgid "" "git-debrebase new-upstream <new-version> [<upstream-details>...] [--|-i <git-" "rebase options...>]" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:139 +#: ../git-debrebase.1.pod:142 msgid "Rebases the delta queue onto a new upstream version. In detail:" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:142 +#: ../git-debrebase.1.pod:145 msgid "" "Firstly, checks that the proposed rebase seems to make sense: It is a snag " "unless the new upstream(s) are fast forward from the previous upstream(s) " @@ -324,12 +331,12 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:150 +#: ../git-debrebase.1.pod:153 msgid "If all seems well, unstitches and launders the branch." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:152 +#: ../git-debrebase.1.pod:155 msgid "" "Then, generates (in a private working area) a new anchor merge commit, on " "top of the breakwater tip, and on top of that a commit to update the version " @@ -337,26 +344,26 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:160 +#: ../git-debrebase.1.pod:163 msgid "Finally, starts a git-rebase of the delta queue onto these new commits." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:164 +#: ../git-debrebase.1.pod:167 msgid "" "That git-rebase may complete successfully, or it may require your " "assistance, just like a normal git-rebase." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:168 +#: ../git-debrebase.1.pod:171 msgid "" "If you git-rebase --abort, the whole new upstream operation is aborted, " "except for the laundering." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:172 +#: ../git-debrebase.1.pod:175 msgid "" "<new-version> may be a whole new Debian version, including revision, or just " "the upstream part, in which case -1 will be appended to make the new Debian " @@ -364,17 +371,17 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:178 +#: ../git-debrebase.1.pod:181 msgid "The <upstream-details> are, optionally, in order:" msgstr "" #. type: =item -#: ../git-debrebase.1.pod:182 +#: ../git-debrebase.1.pod:185 msgid "<upstream-commit-ish>" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:184 +#: ../git-debrebase.1.pod:187 msgid "" "The new upstream branch (or commit-ish). The default is to look for one of " "these tags, in this order: U vU upstream/U; where U is the new upstream " @@ -382,7 +389,7 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:190 +#: ../git-debrebase.1.pod:193 msgid "" "It is a snag if the upstream contains a debian/ directory; if forced to " "proceed, git-debrebase will disregard the upstream's debian/ and take (only) " @@ -390,17 +397,17 @@ msgid "" msgstr "" #. type: =item -#: ../git-debrebase.1.pod:195 +#: ../git-debrebase.1.pod:198 msgid "<piece-name> <piece-upstream-commit-ish>" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:197 +#: ../git-debrebase.1.pod:200 msgid "Specifies that this is a multi-piece upstream. May be repeated." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:200 +#: ../git-debrebase.1.pod:203 msgid "" "When such a pair is specified, git-debrebase will first combine the pieces " "of the upstream together, and then use the result as the combined new " @@ -408,7 +415,7 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:205 +#: ../git-debrebase.1.pod:208 msgid "" "For each <piece-name>, the tree of the <piece-upstream-commit-ish> becomes " "the subdirectory <piece-name> in the combined new upstream (supplanting any " @@ -416,14 +423,14 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:212 +#: ../git-debrebase.1.pod:215 msgid "" "<piece-name> has a restricted syntax: it may contain only ASCII " "alphanumerics and hyphens." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:215 +#: ../git-debrebase.1.pod:218 msgid "" "The combined upstream is itself recorded as a commit, with each of the " "upstream pieces' commits as parents. The combined commit contains an " @@ -432,24 +439,24 @@ msgid "" msgstr "" #. type: =item -#: ../git-debrebase.1.pod:221 +#: ../git-debrebase.1.pod:224 msgid "<git-rebase options>" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:223 +#: ../git-debrebase.1.pod:226 msgid "These will be passed to git rebase." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:225 +#: ../git-debrebase.1.pod:228 msgid "" "If the upstream rebase is troublesome, -i may be helpful. As with plain git-" "debrebase, do not specify a base, or --onto, or --fork-point." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:231 +#: ../git-debrebase.1.pod:234 msgid "" "If you are planning to generate a .dsc, you will also need to have, or " "generate, actual orig tarball(s), which must be identical to the rev-" @@ -460,19 +467,19 @@ msgid "" msgstr "" #. type: =item -#: ../git-debrebase.1.pod:242 +#: ../git-debrebase.1.pod:245 msgid "git-debrebase make-patches [--quiet-would-amend]" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:244 +#: ../git-debrebase.1.pod:247 msgid "" "Generate patches in debian/patches/ representing the changes made to " "upstream files." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:247 +#: ../git-debrebase.1.pod:250 msgid "" "It is not normally necessary to run this command explicitly. When uploading " "to Debian, dgit and git-debrebase will cooperate to regenerate patches as " @@ -480,7 +487,7 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:254 +#: ../git-debrebase.1.pod:257 msgid "" "Normally git-debrebase make-patches will require a laundered branch. (A " "laundered branch does not contain any patches.) But if there are already " @@ -490,7 +497,7 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:263 +#: ../git-debrebase.1.pod:266 msgid "" "If the patches implied by the current branch are not a simple superset of " "those already in debian/patches, make-patches will fail with exit status 7, " @@ -500,53 +507,53 @@ msgid "" msgstr "" #. type: =item -#: ../git-debrebase.1.pod:272 +#: ../git-debrebase.1.pod:275 msgid "git-debrebase convert-from-unapplied [<upstream-commit-ish>]" msgstr "" #. type: =item -#: ../git-debrebase.1.pod:274 +#: ../git-debrebase.1.pod:277 msgid "git-debrebase convert-from-gbp [<upstream-commit-ish>]" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:276 +#: ../git-debrebase.1.pod:279 msgid "Converts any of the following into a git-debrebase interchange branch:" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:282 +#: ../git-debrebase.1.pod:285 msgid "a gbp patches-unapplied branch (but not a gbp pq patch-queue branch)" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:286 +#: ../git-debrebase.1.pod:289 msgid "" "a patches-unapplied git packaging branch containing debian/patches, as used " "with quilt" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:291 +#: ../git-debrebase.1.pod:294 msgid "" "a git branch for a package which has no Debian delta - ie where upstream " "files are have not been modified in Debian, so there are no patches" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:297 +#: ../git-debrebase.1.pod:300 msgid "(These two commands operate identically and are simply aliases.)" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:299 +#: ../git-debrebase.1.pod:302 msgid "" "The conversion is done by generating a new anchor merge, converting any " "quilt patches as a delta queue, and dropping the patches from the tree." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:303 +#: ../git-debrebase.1.pod:306 msgid "" "The upstream commit-ish should correspond to the upstream branch or tag, if " "there is one. It is a snag if it is not an ancestor of HEAD, or if the " @@ -556,7 +563,7 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:311 +#: ../git-debrebase.1.pod:314 msgid "" "It is also a snag if the specified upstream has a debian/ subdirectory. " "This check exists to detect certain likely user errors, but if this " @@ -564,7 +571,7 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:317 +#: ../git-debrebase.1.pod:320 msgid "" "git-debrebase will try to look for the dgit archive view of the most recent " "release, and if it finds it will make a pseduomerge so that your new git-" @@ -572,14 +579,14 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:322 +#: ../git-debrebase.1.pod:325 msgid "" "The result is a well-formed git-debrebase interchange branch. The result is " "also fast-forward from the original branch." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:325 +#: ../git-debrebase.1.pod:328 msgid "" "It is a snag if the new branch looks like it will have diverged, just as for " "a laundering/unstitching call to git-debrebase; See L</Establish the current " @@ -587,7 +594,7 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:329 +#: ../git-debrebase.1.pod:332 msgid "" "Note that it is dangerous not to know whether you are dealing with a (gbp) " "patches-unapplied branch containing quilt patches, or a git-debrebase " @@ -596,39 +603,39 @@ msgid "" msgstr "" #. type: =head1 -#: ../git-debrebase.1.pod:338 +#: ../git-debrebase.1.pod:341 msgid "UNDERLYING AND SUPPLEMENTARY OPERATIONS" msgstr "" #. type: =item -#: ../git-debrebase.1.pod:342 +#: ../git-debrebase.1.pod:345 msgid "git-debrebase breakwater" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:344 +#: ../git-debrebase.1.pod:347 msgid "" "Prints the breakwater tip commitid. If your HEAD branch is not fully " "laundered, prints the tip of the so-far-laundered breakwater." msgstr "" #. type: =item -#: ../git-debrebase.1.pod:348 +#: ../git-debrebase.1.pod:351 msgid "git-debrebase anchor" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:350 +#: ../git-debrebase.1.pod:353 msgid "Prints the breakwater anchor commitid." msgstr "" #. type: =item -#: ../git-debrebase.1.pod:352 +#: ../git-debrebase.1.pod:355 msgid "git-debrebase analyse" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:354 +#: ../git-debrebase.1.pod:357 msgid "" "Walks the history of the current branch, most recent commit first, back " "until the most recent anchor, printing the commit object id, and commit type " @@ -636,44 +643,31 @@ msgid "" msgstr "" #. type: =item -#: ../git-debrebase.1.pod:362 +#: ../git-debrebase.1.pod:365 msgid "git-debrebase record-ffq-prev" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:364 +#: ../git-debrebase.1.pod:367 msgid "" "Establishes the current branch's ffq-prev, as discussed in L</UNSTITCHING " "AND LAUNDERING>, but does not launder the branch or move HEAD." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:368 +#: ../git-debrebase.1.pod:371 msgid "" "It is an error if the ffq-prev could not be recorded. It is also an error " "if an ffq-prev has already been recorded, unless --noop-ok." msgstr "" #. type: =item -#: ../git-debrebase.1.pod:372 -msgid "git-debrebase launder-v0" -msgstr "" - -#. type: textblock -#: ../git-debrebase.1.pod:374 -msgid "" -"Launders the branch without recording anything in ffq-prev. Then prints " -"some information about the current branch. Do not use this operation; it " -"will be withdrawn soon." -msgstr "" - -#. type: =item -#: ../git-debrebase.1.pod:379 +#: ../git-debrebase.1.pod:375 msgid "git-debrebase convert-to-gbp" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:381 +#: ../git-debrebase.1.pod:377 msgid "" "Converts a laundered branch into a gbp patches-unapplied branch containing " "quilt patches. The result is not fast forward from the interchange branch, " @@ -681,7 +675,7 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:386 +#: ../git-debrebase.1.pod:382 msgid "" "This is provided mostly for the test suite and for unusual situations. It " "should only be used with care and with a proper understanding of the " @@ -689,19 +683,19 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:391 +#: ../git-debrebase.1.pod:387 msgid "" "Be sure to not accidentally treat the result as a git-debrebase branch, or " "you will drop all the patches!" msgstr "" #. type: =item -#: ../git-debrebase.1.pod:395 +#: ../git-debrebase.1.pod:391 msgid "git-debrebase convert-from-dgit-view [<convert-options>] [upstream]" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:397 +#: ../git-debrebase.1.pod:393 msgid "" "Converts any dgit-compatible git branch corresponding to a (possibly " "hypothetical) 3.0 quilt dsc source package into a git-debrebase-compatible " @@ -709,7 +703,7 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:401 +#: ../git-debrebase.1.pod:397 msgid "" "This operation should not be used if the branch is already in git-debrebase " "form. Normally git-debrebase will refuse to continue in this case (or " @@ -717,7 +711,7 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:406 +#: ../git-debrebase.1.pod:402 msgid "" "Some representation of the original upstream source code will be needed. If " "I<upstream> is supplied, that must be a suitable upstream commit. By " @@ -726,7 +720,7 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:412 +#: ../git-debrebase.1.pod:408 msgid "" "The upstream source must be exactly right and all the patches in debian/" "patches must be up to date. Applying the patches from debian/patches to the " @@ -734,7 +728,7 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:417 +#: ../git-debrebase.1.pod:413 msgid "" "The output is laundered and stitched. The resulting history is not " "particularly pretty, especially if orig tarball(s) were imported to produce " @@ -742,31 +736,31 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:422 +#: ../git-debrebase.1.pod:418 msgid "" "The available convert-options are as follows. (These must come after " "convert-from-dgit-view.)" msgstr "" #. type: =item -#: ../git-debrebase.1.pod:427 +#: ../git-debrebase.1.pod:423 msgid "--[no-]diagnose" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:429 +#: ../git-debrebase.1.pod:425 msgid "" "Print additional error messages to help diagnose failure to find an " "appropriate upstream. --no-diagnose is the default." msgstr "" #. type: =item -#: ../git-debrebase.1.pod:433 +#: ../git-debrebase.1.pod:429 msgid "--build-products-dir" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:435 +#: ../git-debrebase.1.pod:431 msgid "" "Directory to look in for orig tarballs. The default is the git config " "option dgit.default.build-products-dir or failing that, C<..>. Passed on to " @@ -774,35 +768,35 @@ msgid "" msgstr "" #. type: =item -#: ../git-debrebase.1.pod:441 +#: ../git-debrebase.1.pod:437 msgid "--[no-]origs" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:443 +#: ../git-debrebase.1.pod:439 msgid "" "Whether to try to look for or use any orig tarballs. --origs is the default." msgstr "" #. type: =item -#: ../git-debrebase.1.pod:446 +#: ../git-debrebase.1.pod:442 msgid "--[no-]tags" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:448 +#: ../git-debrebase.1.pod:444 msgid "" "Whether to try to look for or use any upstream git tags. --tags is the " "default." msgstr "" #. type: =item -#: ../git-debrebase.1.pod:451 +#: ../git-debrebase.1.pod:447 msgid "--always-convert-anyway" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:453 +#: ../git-debrebase.1.pod:449 msgid "" "Perform the conversion operation, producing unpleasant extra history, even " "if the branch seems to be in git-debrebase form already. This should not be " @@ -810,12 +804,12 @@ msgid "" msgstr "" #. type: =item -#: ../git-debrebase.1.pod:461 +#: ../git-debrebase.1.pod:457 msgid "git-debrebase forget-was-ever-debrebase" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:463 +#: ../git-debrebase.1.pod:459 msgid "" "Deletes the ffq-prev and debrebase-last refs associated with this branch, " "that git-debrebase and dgit use to determine whether this branch is managed " @@ -823,19 +817,19 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:469 +#: ../git-debrebase.1.pod:465 msgid "" "This can be useful if you were just playing with git-debrebase, and have " "used git-reset --hard to go back to a commit before your experiments." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:473 +#: ../git-debrebase.1.pod:469 msgid "Do not use this if you expect to run git-debrebase on the branch again." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:479 +#: ../git-debrebase.1.pod:475 msgid "" "This section documents the general options to git-debrebase (ie, the ones " "which immediately follow git-debrebase or git debrebase on the command " @@ -844,78 +838,78 @@ msgid "" msgstr "" #. type: =item -#: ../git-debrebase.1.pod:491 +#: ../git-debrebase.1.pod:487 msgid "-f<snag-id>" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:493 +#: ../git-debrebase.1.pod:489 msgid "Turns snag(s) with id <snag-id> into warnings." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:495 +#: ../git-debrebase.1.pod:491 msgid "" "Some troublesome things which git-debrebase encounters are B<snag>s. (The " "specific instances are discussed in the text for the relevant operation.)" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:500 +#: ../git-debrebase.1.pod:496 msgid "" "When a snag is detected, a message is printed to stderr containing the snag " "id (in the form C<-f<snag-idE<gt>>), along with some prose." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:505 +#: ../git-debrebase.1.pod:501 msgid "" "If snags are detected, git-debrebase does not continue, unless the relevant -" "f<snag-id> is specified, or --force is specified." msgstr "" #. type: =item -#: ../git-debrebase.1.pod:509 +#: ../git-debrebase.1.pod:505 msgid "--force" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:511 +#: ../git-debrebase.1.pod:507 msgid "Turns all snags into warnings. See the -f<snag-id> option." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:514 +#: ../git-debrebase.1.pod:510 msgid "" "Do not invoke git-debrebase --force in scripts and aliases; instead, specify " "the particular -f<snag-id> for expected snags." msgstr "" #. type: =item -#: ../git-debrebase.1.pod:517 +#: ../git-debrebase.1.pod:513 msgid "--noop-ok" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:519 +#: ../git-debrebase.1.pod:515 msgid "" "Suppresses the error in some situations where git-debrebase does nothing, " "because there is nothing to do." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:523 +#: ../git-debrebase.1.pod:519 msgid "" "The specific instances are discussed in the text for the relvant operation." msgstr "" #. type: =item -#: ../git-debrebase.1.pod:526 +#: ../git-debrebase.1.pod:522 msgid "--anchor=<commit-ish>" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:528 +#: ../git-debrebase.1.pod:524 msgid "" "Treats <commit-ish> as an anchor. This overrides the usual logic which " "automatically classifies commits as anchors, pseudomerges, delta queue " @@ -923,7 +917,7 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:532 +#: ../git-debrebase.1.pod:528 msgid "" "It also disables some coherency checks which depend on metadata extracted " "from its commit message, so it is a snag (C<-fanchor-treated>) if <commit-" @@ -934,53 +928,53 @@ msgid "" msgstr "" #. type: =item -#: ../git-debrebase.1.pod:542 +#: ../git-debrebase.1.pod:538 msgid "--dgit=<program>" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:544 +#: ../git-debrebase.1.pod:540 msgid "" "Run <program>, instead of dgit from PATH, when invocation of dgit is " "necessary. This is provided mostly for the benefit of the test suite." msgstr "" #. type: =item -#: ../git-debrebase.1.pod:548 +#: ../git-debrebase.1.pod:544 msgid "-D" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:550 +#: ../git-debrebase.1.pod:546 msgid "Requests (more) debugging. May be repeated." msgstr "" #. type: =item -#: ../git-debrebase.1.pod:552 +#: ../git-debrebase.1.pod:548 msgid "--experimental-merge-resolution" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:554 +#: ../git-debrebase.1.pod:550 msgid "" "Enable experimental code for handling general merges (see L<git-debrebase(5)/" "General merges>)." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:557 +#: ../git-debrebase.1.pod:553 msgid "" "If using this option succeeds, the output is likely to be correct, although " "it would be a good idea to check that it seems sane." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:561 +#: ../git-debrebase.1.pod:557 msgid "If it fails, your tree should be left where it was." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:563 +#: ../git-debrebase.1.pod:559 msgid "" "However, there may be lossage of various kinds, including misleading error " "messages, and references to nonexistent documentation. On merge failure, it " @@ -990,24 +984,24 @@ msgid "" msgstr "" #. type: =head1 -#: ../git-debrebase.1.pod:575 +#: ../git-debrebase.1.pod:571 msgid "UNSTITCHING AND LAUNDERING" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:577 +#: ../git-debrebase.1.pod:573 msgid "" "Several operations unstitch and launder the branch first. In detail this " "means:" msgstr "" #. type: =head2 -#: ../git-debrebase.1.pod:580 +#: ../git-debrebase.1.pod:576 msgid "Establish the current branch's ffq-prev" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:582 +#: ../git-debrebase.1.pod:578 msgid "" "If ffq-prev is not yet recorded, git-debrebase checks that the current " "branch is ahead of relevant remote tracking branches. The relevant branches " @@ -1015,30 +1009,30 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:594 +#: ../git-debrebase.1.pod:590 msgid "" "The branch that git would merge from (remote.<branch>.merge, remote.<branch>." "remote);" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:599 +#: ../git-debrebase.1.pod:595 msgid "" "The branch git would push to, if different (remote.<branch>.pushRemote etc.);" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:604 +#: ../git-debrebase.1.pod:600 msgid "For local dgit suite branches, the corresponding tracking remote;" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:609 +#: ../git-debrebase.1.pod:605 msgid "If you are on C<master>, remotes/dgit/dgit/sid." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:614 +#: ../git-debrebase.1.pod:610 msgid "" "The apparently relevant ref names to check are filtered through branch." "<branch>.ffq-ffrefs, which is a semicolon-separated list of glob patterns, " @@ -1046,7 +1040,7 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:619 +#: ../git-debrebase.1.pod:615 msgid "" "In each case it is a snag if the local HEAD is behind the checked remote, or " "if local HEAD has diverged from it. All the checks are done locally using " @@ -1055,31 +1049,31 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:625 +#: ../git-debrebase.1.pod:621 msgid "" "If these checks pass, or are forced, git-debrebse then records the current " "tip as ffq-prev." msgstr "" #. type: =head2 -#: ../git-debrebase.1.pod:629 +#: ../git-debrebase.1.pod:625 msgid "Examine the branch" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:631 +#: ../git-debrebase.1.pod:627 msgid "" "git-debrebase analyses the current HEAD's history to find the anchor in its " "breakwater, and the most recent breakwater tip." msgstr "" #. type: =head2 -#: ../git-debrebase.1.pod:636 +#: ../git-debrebase.1.pod:632 msgid "Rewrite the commits into laundered form" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:638 +#: ../git-debrebase.1.pod:634 msgid "" "Mixed debian+upstream commits are split into two commits each. Delta queue " "(upstream files) commits bubble to the top. Pseudomerges, and quilt patch " @@ -1087,13 +1081,13 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:644 +#: ../git-debrebase.1.pod:640 msgid "" "This rewrite will always succeed, by construction. The result is the " "laundered branch." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:649 +#: ../git-debrebase.1.pod:645 msgid "git-debrebase(1), dgit-maint-debrebase(7), dgit(1), gitglossary(7)" msgstr "" |