msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2019-08-10 19:42+0100\n"
+"POT-Creation-Date: 2020-02-02 16:50+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
msgstr ""
#. type: =head1
-#: ../dgit.1:496 ../git-debrebase.1.pod:476
+#: ../dgit.1:496 ../git-debrebase.1.pod:477
#, no-wrap
msgid "OPTIONS"
msgstr ""
#. type: =head1
-#: ../dgit.1:1555 ../dgit.7:23 ../dgit-user.7.pod:447
+#: ../dgit.1:1575 ../dgit.7:23 ../dgit-user.7.pod:447
#: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126
-#: ../dgit-maint-merge.7.pod:521 ../dgit-maint-gbp.7.pod:136
-#: ../dgit-maint-debrebase.7.pod:778 ../dgit-downstream-dsc.7.pod:352
-#: ../dgit-sponsorship.7.pod:321 ../dgit-maint-bpo.7.pod:134
-#: ../git-debrebase.1.pod:633 ../git-debrebase.5.pod:678
-#: ../git-debpush.1.pod:254
+#: ../dgit-maint-merge.7.pod:524 ../dgit-maint-gbp.7.pod:136
+#: ../dgit-maint-debrebase.7.pod:782 ../dgit-downstream-dsc.7.pod:352
+#: ../dgit-sponsorship.7.pod:321 ../dgit-maint-bpo.7.pod:140
+#: ../git-debrebase.1.pod:634 ../git-debrebase.5.pod:678
+#: ../git-debpush.1.pod:261
#, no-wrap
msgid "SEE ALSO"
msgstr ""
#: ../git-debrebase.1.pod:131
msgid ""
"Throws away all the work since the branch was last stitched. This is done "
-"by rewinding you to ffq-prev."
+"by resetting you to ffq-prev and discarding all working tree changes."
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:134
+#: ../git-debrebase.1.pod:135
msgid "If you are in the middle of a git-rebase, will abort that too."
msgstr ""
#. type: =item
-#: ../git-debrebase.1.pod:136
+#: ../git-debrebase.1.pod:137
msgid "git-debrebase new-upstream <new-version> [<upstream-details>...]"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:138
+#: ../git-debrebase.1.pod:139
msgid "Rebases the delta queue onto a new upstream version. In detail:"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:141
+#: ../git-debrebase.1.pod:142
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) "
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:149
+#: ../git-debrebase.1.pod:150
msgid "If all seems well, unstitches and launders the branch."
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:151
+#: ../git-debrebase.1.pod:152
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 "
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:159
+#: ../git-debrebase.1.pod:160
msgid "Finally, starts a git-rebase of the delta queue onto these new commits."
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:163
+#: ../git-debrebase.1.pod:164
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:167
+#: ../git-debrebase.1.pod:168
msgid ""
"If you git-rebase --abort, the whole new upstream operation is aborted, "
"except for the laundering."
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:171
+#: ../git-debrebase.1.pod:172
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 "
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:177
+#: ../git-debrebase.1.pod:178
msgid "The <upstream-details> are, optionally, in order:"
msgstr ""
#. type: =item
-#: ../git-debrebase.1.pod:181
+#: ../git-debrebase.1.pod:182
msgid "<upstream-commit-ish>"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:183
+#: ../git-debrebase.1.pod:184
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 "
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:189
+#: ../git-debrebase.1.pod:190
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) "
msgstr ""
#. type: =item
-#: ../git-debrebase.1.pod:194
+#: ../git-debrebase.1.pod:195
msgid "<piece-name> <piece-upstream-commit-ish>"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:196
+#: ../git-debrebase.1.pod:197
msgid "Specifies that this is a multi-piece upstream. May be repeated."
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:199
+#: ../git-debrebase.1.pod:200
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 "
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:204
+#: ../git-debrebase.1.pod:205
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 "
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:211
+#: ../git-debrebase.1.pod:212
msgid ""
"<piece-name> has a restricted syntax: it may contain only ASCII "
"alphanumerics and hyphens."
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:214
+#: ../git-debrebase.1.pod:215
msgid ""
"The combined upstream is itself recorded as a commit, with each of the "
"upstream pieces' commits as parents. The combined commit contains an "
msgstr ""
#. type: =item
-#: ../git-debrebase.1.pod:220
+#: ../git-debrebase.1.pod:221
msgid "<git-rebase options>"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:222
+#: ../git-debrebase.1.pod:223
msgid "These will be passed to git rebase."
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:224
+#: ../git-debrebase.1.pod:225
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:230
+#: ../git-debrebase.1.pod:231
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-"
msgstr ""
#. type: =item
-#: ../git-debrebase.1.pod:241
+#: ../git-debrebase.1.pod:242
msgid "git-debrebase make-patches [--quiet-would-amend]"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:243
+#: ../git-debrebase.1.pod:244
msgid ""
"Generate patches in debian/patches/ representing the changes made to "
"upstream files."
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:246
+#: ../git-debrebase.1.pod:247
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 "
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:253
+#: ../git-debrebase.1.pod:254
msgid ""
"Normally git-debrebase make-patches will require a laundered branch. (A "
"laundered branch does not contain any patches.) But if there are already "
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:262
+#: ../git-debrebase.1.pod:263
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, "
msgstr ""
#. type: =item
-#: ../git-debrebase.1.pod:271
+#: ../git-debrebase.1.pod:272
msgid "git-debrebase convert-from-unapplied [<upstream-commit-ish>]"
msgstr ""
#. type: =item
-#: ../git-debrebase.1.pod:273
+#: ../git-debrebase.1.pod:274
msgid "git-debrebase convert-from-gbp [<upstream-commit-ish>]"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:275
+#: ../git-debrebase.1.pod:276
msgid "Converts any of the following into a git-debrebase interchange branch:"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:281
+#: ../git-debrebase.1.pod:282
msgid "a gbp patches-unapplied branch (but not a gbp pq patch-queue branch)"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:285
+#: ../git-debrebase.1.pod:286
msgid ""
"a patches-unapplied git packaging branch containing debian/patches, as used "
"with quilt"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:290
+#: ../git-debrebase.1.pod:291
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:296
+#: ../git-debrebase.1.pod:297
msgid "(These two commands operate identically and are simply aliases.)"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:298
+#: ../git-debrebase.1.pod:299
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:302
+#: ../git-debrebase.1.pod:303
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 "
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:310
+#: ../git-debrebase.1.pod:311
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 "
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:316
+#: ../git-debrebase.1.pod:317
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-"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:321
+#: ../git-debrebase.1.pod:322
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:324
+#: ../git-debrebase.1.pod:325
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 "
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:328
+#: ../git-debrebase.1.pod:329
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 "
msgstr ""
#. type: =head1
-#: ../git-debrebase.1.pod:337
+#: ../git-debrebase.1.pod:338
msgid "UNDERLYING AND SUPPLEMENTARY OPERATIONS"
msgstr ""
#. type: =item
-#: ../git-debrebase.1.pod:341
+#: ../git-debrebase.1.pod:342
msgid "git-debrebase breakwater"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:343
+#: ../git-debrebase.1.pod:344
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:347
+#: ../git-debrebase.1.pod:348
msgid "git-debrebase anchor"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:349
+#: ../git-debrebase.1.pod:350
msgid "Prints the breakwater anchor commitid."
msgstr ""
#. type: =item
-#: ../git-debrebase.1.pod:351
+#: ../git-debrebase.1.pod:352
msgid "git-debrebase analyse"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:353
+#: ../git-debrebase.1.pod:354
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 "
msgstr ""
#. type: =item
-#: ../git-debrebase.1.pod:361
+#: ../git-debrebase.1.pod:362
msgid "git-debrebase record-ffq-prev"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:363
+#: ../git-debrebase.1.pod:364
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:367
+#: ../git-debrebase.1.pod:368
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:371
+#: ../git-debrebase.1.pod:372
msgid "git-debrebase launder-v0"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:373
+#: ../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 "
msgstr ""
#. type: =item
-#: ../git-debrebase.1.pod:378
+#: ../git-debrebase.1.pod:379
msgid "git-debrebase convert-to-gbp"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:380
+#: ../git-debrebase.1.pod:381
msgid ""
"Converts a laundered branch into a gbp patches-unapplied branch containing "
"quilt patches. The result is not fast forward from the interchange branch, "
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:385
+#: ../git-debrebase.1.pod:386
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 "
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:390
+#: ../git-debrebase.1.pod:391
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:394
+#: ../git-debrebase.1.pod:395
msgid "git-debrebase convert-from-dgit-view [<convert-options>] [upstream]"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:396
+#: ../git-debrebase.1.pod:397
msgid ""
"Converts any dgit-compatible git branch corresponding to a (possibly "
"hypothetical) 3.0 quilt dsc source package into a git-debrebase-compatible "
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:400
+#: ../git-debrebase.1.pod:401
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 "
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:405
+#: ../git-debrebase.1.pod:406
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 "
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:411
+#: ../git-debrebase.1.pod:412
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 "
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:416
+#: ../git-debrebase.1.pod:417
msgid ""
"The output is laundered and stitched. The resulting history is not "
"particularly pretty, especially if orig tarball(s) were imported to produce "
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:421
+#: ../git-debrebase.1.pod:422
msgid ""
"The available convert-options are as follows. (These must come after "
"convert-from-dgit-view.)"
msgstr ""
#. type: =item
-#: ../git-debrebase.1.pod:426
+#: ../git-debrebase.1.pod:427
msgid "--[no-]diagnose"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:428
+#: ../git-debrebase.1.pod:429
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:432
+#: ../git-debrebase.1.pod:433
msgid "--build-products-dir"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:434
+#: ../git-debrebase.1.pod:435
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 "
msgstr ""
#. type: =item
-#: ../git-debrebase.1.pod:440
+#: ../git-debrebase.1.pod:441
msgid "--[no-]origs"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:442
+#: ../git-debrebase.1.pod:443
msgid ""
"Whether to try to look for or use any orig tarballs. --origs is the default."
msgstr ""
#. type: =item
-#: ../git-debrebase.1.pod:445
+#: ../git-debrebase.1.pod:446
msgid "--[no-]tags"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:447
+#: ../git-debrebase.1.pod:448
msgid ""
"Whether to try to look for or use any upstream git tags. --tags is the "
"default."
msgstr ""
#. type: =item
-#: ../git-debrebase.1.pod:450
+#: ../git-debrebase.1.pod:451
msgid "--always-convert-anyway"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:452
+#: ../git-debrebase.1.pod:453
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 "
msgstr ""
#. type: =item
-#: ../git-debrebase.1.pod:460
+#: ../git-debrebase.1.pod:461
msgid "git-debrebase forget-was-ever-debrebase"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:462
+#: ../git-debrebase.1.pod:463
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 "
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:468
+#: ../git-debrebase.1.pod:469
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:472
+#: ../git-debrebase.1.pod:473
msgid "Do not use this if you expect to run git-debrebase on the branch again."
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:478
+#: ../git-debrebase.1.pod:479
msgid ""
"This section documents the general options to git-debrebase (ie, the ones "
"which immediately follow git-debrebase or git debrebase on the command "
msgstr ""
#. type: =item
-#: ../git-debrebase.1.pod:490
+#: ../git-debrebase.1.pod:491
msgid "-f<snag-id>"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:492
+#: ../git-debrebase.1.pod:493
msgid "Turns snag(s) with id <snag-id> into warnings."
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:494
+#: ../git-debrebase.1.pod:495
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:499
+#: ../git-debrebase.1.pod:500
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:504
+#: ../git-debrebase.1.pod:505
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:508
+#: ../git-debrebase.1.pod:509
msgid "--force"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:510
+#: ../git-debrebase.1.pod:511
msgid "Turns all snags into warnings. See the -f<snag-id> option."
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:513
+#: ../git-debrebase.1.pod:514
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:516
+#: ../git-debrebase.1.pod:517
msgid "--noop-ok"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:518
+#: ../git-debrebase.1.pod:519
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:522
+#: ../git-debrebase.1.pod:523
msgid ""
"The specific instances are discussed in the text for the relvant operation."
msgstr ""
#. type: =item
-#: ../git-debrebase.1.pod:525
+#: ../git-debrebase.1.pod:526
msgid "--anchor=<commit-ish>"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:527
+#: ../git-debrebase.1.pod:528
msgid ""
"Treats <commit-ish> as an anchor. This overrides the usual logic which "
"automatically classifies commits as anchors, pseudomerges, delta queue "
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:531
+#: ../git-debrebase.1.pod:532
msgid ""
"It also disables some coherency checks which depend on metadata extracted "
"from its commit message, so it is a snag if <commit-ish> is the anchor for "
msgstr ""
#. type: =item
-#: ../git-debrebase.1.pod:538
+#: ../git-debrebase.1.pod:539
msgid "--dgit=<program>"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:540
+#: ../git-debrebase.1.pod:541
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:544
+#: ../git-debrebase.1.pod:545
msgid "-D"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:546
+#: ../git-debrebase.1.pod:547
msgid "Requests (more) debugging. May be repeated."
msgstr ""
#. type: =item
-#: ../git-debrebase.1.pod:548
+#: ../git-debrebase.1.pod:549
msgid "--experimental-merge-resolution"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:550
+#: ../git-debrebase.1.pod:551
msgid ""
"Enable experimental code for handling general merges (see L<git-debrebase(5)/"
"General merges>)."
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:553
+#: ../git-debrebase.1.pod:554
msgid ""
"This option may generate lossage of various kinds, including misleading "
"error messages, references to nonexistent documentation, and you being "
msgstr ""
#. type: =head1
-#: ../git-debrebase.1.pod:561
+#: ../git-debrebase.1.pod:562
msgid "UNSTITCHING AND LAUNDERING"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:563
+#: ../git-debrebase.1.pod:564
msgid ""
"Several operations unstitch and launder the branch first. In detail this "
"means:"
msgstr ""
#. type: =head2
-#: ../git-debrebase.1.pod:566
+#: ../git-debrebase.1.pod:567
msgid "Establish the current branch's ffq-prev"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:568
+#: ../git-debrebase.1.pod:569
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 "
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:580
+#: ../git-debrebase.1.pod:581
msgid ""
"The branch that git would merge from (remote.<branch>.merge, remote.<branch>."
"remote);"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:585
+#: ../git-debrebase.1.pod:586
msgid ""
"The branch git would push to, if different (remote.<branch>.pushRemote etc.);"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:590
+#: ../git-debrebase.1.pod:591
msgid "For local dgit suite branches, the corresponding tracking remote;"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:595
+#: ../git-debrebase.1.pod:596
msgid "If you are on C<master>, remotes/dgit/dgit/sid."
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:600
+#: ../git-debrebase.1.pod:601
msgid ""
"The apparently relevant ref names to check are filtered through branch."
"<branch>.ffq-ffrefs, which is a semicolon-separated list of glob patterns, "
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:605
+#: ../git-debrebase.1.pod:606
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 "
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:611
+#: ../git-debrebase.1.pod:612
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:615
+#: ../git-debrebase.1.pod:616
msgid "Examine the branch"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:617
+#: ../git-debrebase.1.pod:618
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:622
+#: ../git-debrebase.1.pod:623
msgid "Rewrite the commits into laundered form"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:624
+#: ../git-debrebase.1.pod:625
msgid ""
"Mixed debian+upstream commits are split into two commits each. Delta queue "
"(upstream files) commits bubble to the top. Pseudomerges, and quilt patch "
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:630
+#: ../git-debrebase.1.pod:631
msgid ""
"This rewrite will always succeed, by construction. The result is the "
"laundered branch."
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:635
+#: ../git-debrebase.1.pod:636
msgid "git-debrebase(1), dgit-maint-debrebase(7), dgit(1), gitglossary(7)"
msgstr ""
~ianmdlvl / dgit.git / blobdiff