1 # SOME DESCRIPTIVE TITLE
2 # Copyright (C) YEAR Free Software Foundation, Inc.
3 # This file is distributed under the same license as the PACKAGE package.
4 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
9 "Project-Id-Version: PACKAGE VERSION\n"
10 "POT-Creation-Date: 2019-08-10 19:42+0100\n"
11 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
12 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13 "Language-Team: LANGUAGE <LL@li.org>\n"
16 "Content-Type: text/plain; charset=UTF-8\n"
17 "Content-Transfer-Encoding: 8bit\n"
20 #: ../dgit.1:3 ../dgit.7:2 ../dgit-user.7.pod:1 ../dgit-nmu-simple.7.pod:1
21 #: ../dgit-maint-native.7.pod:1 ../dgit-maint-merge.7.pod:1
22 #: ../dgit-maint-gbp.7.pod:1 ../dgit-maint-debrebase.7.pod:1
23 #: ../dgit-downstream-dsc.7.pod:1 ../dgit-sponsorship.7.pod:1
24 #: ../dgit-maint-bpo.7.pod:1 ../git-debrebase.1.pod:1 ../git-debrebase.5.pod:1
25 #: ../git-debpush.1.pod:1
31 #: ../dgit.1:496 ../git-debrebase.1.pod:476
37 #: ../dgit.1:1555 ../dgit.7:23 ../dgit-user.7.pod:447
38 #: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126
39 #: ../dgit-maint-merge.7.pod:521 ../dgit-maint-gbp.7.pod:136
40 #: ../dgit-maint-debrebase.7.pod:778 ../dgit-downstream-dsc.7.pod:352
41 #: ../dgit-sponsorship.7.pod:321 ../dgit-maint-bpo.7.pod:134
42 #: ../git-debrebase.1.pod:633 ../git-debrebase.5.pod:678
43 #: ../git-debpush.1.pod:254
49 #: ../git-debrebase.1.pod:3
51 "git-debrebase - tool to maintain series of Debian changes to upstream source"
55 #: ../git-debrebase.1.pod:5
60 #: ../git-debrebase.1.pod:7
63 " git-debrebase [<options...>] [-- <git-rebase options...>]\n"
64 " git-debrebase [<options...>] <operation> [<operation options...>\n"
69 #: ../git-debrebase.1.pod:10
70 msgid "QUICK REFERENCE"
74 #: ../git-debrebase.1.pod:12
75 msgid "These are most of the commands you will regularly need:"
79 #: ../git-debrebase.1.pod:14
82 " git debrebase -i # edit the patch queue\n"
83 " git debrebase conclude && git push # push to eg salsa\n"
84 " git debrebase conclude && dgit push-source # source-only upload\n"
85 " git debrebase [-i] new-upstream 1.2.3-1 # uses tag, eg \"v1.2.3\"\n"
86 " dpkg-buildpackage -uc -b # get test debs, at any time\n"
91 #: ../git-debrebase.1.pod:20
93 "To add patches, or edit the packaging, just make git commits. Ignore "
94 "anything that may appear in debian/patches. Avoid using \"git pull\" and "
95 "\"git merge\" without \"--ff-only\"."
99 #: ../git-debrebase.1.pod:24
101 "git-debrebase has a special branch format, so see \"CONVERTING AN EXISTING "
102 "PACKAGE\" in L<dgit-maint-debrebase(7)>."
106 #: ../git-debrebase.1.pod:27
107 msgid "GUIDE TO DOCUMENTATION"
111 #: ../git-debrebase.1.pod:29
113 "This is the command line reference. There is also a detailed workflow "
114 "tutorial at L<dgit-maint-debrebase(7)> (on which the above \"QUICK REFERENCE"
115 "\" is based). For background, theory of operation, and definitions see "
116 "L<git-debrebase(5)>."
120 #: ../git-debrebase.1.pod:36
122 "You should read this manpage in conjunction with L<git-debrebase(5)/"
123 "TERMINOLOGY>, which defines many important terms used here."
127 #: ../git-debrebase.1.pod:40
128 msgid "PRINCIPAL OPERATIONS"
132 #: ../git-debrebase.1.pod:44
133 msgid "git-debrebase [-- <git-rebase options...>]"
137 #: ../git-debrebase.1.pod:46
138 msgid "git-debrebase [-i <further git-rebase options...>]"
142 #: ../git-debrebase.1.pod:48
144 "Unstitches and launders the branch. (See L</UNSTITCHING AND LAUNDERING> "
149 #: ../git-debrebase.1.pod:51
151 "Then, if any git-rebase options were supplied, edits the Debian delta queue, "
152 "using git-rebase, by running"
156 #: ../git-debrebase.1.pod:55
159 " git rebase <git-rebase options> <breakwater-tip>\n"
164 #: ../git-debrebase.1.pod:57
166 "Do not pass a base branch argument: git-debrebase will supply that. Do not "
167 "use --onto, or --fork-point. Useful git-rebase options include -i and --"
172 #: ../git-debrebase.1.pod:62
174 "If git-rebase stops for any reason, you may git-rebase --abort, --continue, "
175 "or --skip, as usual. If you abort the git-rebase, the branch will still "
176 "have been laundered, but everything in the rebase will be undone."
180 #: ../git-debrebase.1.pod:68
182 "The options for git-rebase must either start with C<-i>, or be prececded by "
183 "C<-->, to distinguish them from options for git-debrebase."
187 #: ../git-debrebase.1.pod:72
189 "It is hazardous to use plain git-rebase on a git-debrebase branch, because "
190 "git-rebase has a tendency to start the rebase too far back in history, and "
191 "then drop important commits. See L<git-debrebase(5)/ILLEGAL OPERATIONS>"
195 #: ../git-debrebase.1.pod:78
196 msgid "git-debrebase status"
200 #: ../git-debrebase.1.pod:80
202 "Analyses the current branch, both in terms of its contents, and the refs "
203 "which are relevant to git-debrebase, and prints a human-readable summary."
207 #: ../git-debrebase.1.pod:85
209 "Please do not attempt to parse the output; it may be reformatted or "
210 "reorganised in the future. Instead, use one of the L<UNDERLYING AND "
211 "SUPPLEMENTARY OPERATIONS> described below."
215 #: ../git-debrebase.1.pod:91
216 msgid "git-debrebase conclude"
220 #: ../git-debrebase.1.pod:93
222 "Finishes a git-debrebase session, tidying up the branch and making it fast "
227 #: ../git-debrebase.1.pod:96
229 "Specifically: if the branch is unstitched, launders and restitches it, "
230 "making a new pseudomerge. Otherwise, it is an error, unless --noop-ok."
234 #: ../git-debrebase.1.pod:102
235 msgid "git-debrebase quick"
239 #: ../git-debrebase.1.pod:104
241 "Unconditionally launders and restitches the branch, consuming any ffq-prev "
242 "and making a new pseudomerge."
246 #: ../git-debrebase.1.pod:108
247 msgid "If the branch is already laundered and stitched, does nothing."
251 #: ../git-debrebase.1.pod:110
252 msgid "git-debrebase prepush [--prose=<for commit message>]"
256 #: ../git-debrebase.1.pod:112
257 msgid "If the branch is unstitched, stitches it, consuming ffq-prev."
261 #: ../git-debrebase.1.pod:116
263 "This is a good command to run before pushing to a git server. You should "
264 "consider using B<conclude> instead, because that launders the branch too."
268 #: ../git-debrebase.1.pod:120
269 msgid "git-debrebase stitch [--prose=<for commit message>]"
273 #: ../git-debrebase.1.pod:122
274 msgid "Stitches the branch, consuming ffq-prev."
278 #: ../git-debrebase.1.pod:125
279 msgid "If there is no ffq-prev, it is an error, unless --noop-ok."
283 #: ../git-debrebase.1.pod:127
284 msgid "You should consider using B<prepush> or B<conclude> instead."
288 #: ../git-debrebase.1.pod:129
289 msgid "git-debrebase scrap"
293 #: ../git-debrebase.1.pod:131
295 "Throws away all the work since the branch was last stitched. This is done "
296 "by rewinding you to ffq-prev."
300 #: ../git-debrebase.1.pod:134
301 msgid "If you are in the middle of a git-rebase, will abort that too."
305 #: ../git-debrebase.1.pod:136
306 msgid "git-debrebase new-upstream <new-version> [<upstream-details>...]"
310 #: ../git-debrebase.1.pod:138
311 msgid "Rebases the delta queue onto a new upstream version. In detail:"
315 #: ../git-debrebase.1.pod:141
317 "Firstly, checks that the proposed rebase seems to make sense: It is a snag "
318 "unless the new upstream(s) are fast forward from the previous upstream(s) "
319 "as found in the current breakwater anchor. And, in the case of a multi-"
320 "piece upstream (a multi-component upstream, in dpkg-source terminology), if "
321 "the pieces are not in the same order, with the same names."
325 #: ../git-debrebase.1.pod:149
326 msgid "If all seems well, unstitches and launders the branch."
330 #: ../git-debrebase.1.pod:151
332 "Then, generates (in a private working area) a new anchor merge commit, on "
333 "top of the breakwater tip, and on top of that a commit to update the version "
334 "number in debian/changelog."
338 #: ../git-debrebase.1.pod:159
339 msgid "Finally, starts a git-rebase of the delta queue onto these new commits."
343 #: ../git-debrebase.1.pod:163
345 "That git-rebase may complete successfully, or it may require your "
346 "assistance, just like a normal git-rebase."
350 #: ../git-debrebase.1.pod:167
352 "If you git-rebase --abort, the whole new upstream operation is aborted, "
353 "except for the laundering."
357 #: ../git-debrebase.1.pod:171
359 "<new-version> may be a whole new Debian version, including revision, or just "
360 "the upstream part, in which case -1 will be appended to make the new Debian "
365 #: ../git-debrebase.1.pod:177
366 msgid "The <upstream-details> are, optionally, in order:"
370 #: ../git-debrebase.1.pod:181
371 msgid "<upstream-commit-ish>"
375 #: ../git-debrebase.1.pod:183
377 "The new upstream branch (or commit-ish). The default is to look for one of "
378 "these tags, in this order: U vU upstream/U; where U is the new upstream "
379 "version. (This is the same algorithm as L<git-deborig(1)>.)"
383 #: ../git-debrebase.1.pod:189
385 "It is a snag if the upstream contains a debian/ directory; if forced to "
386 "proceed, git-debrebase will disregard the upstream's debian/ and take (only) "
387 "the packaging from the current breakwater."
391 #: ../git-debrebase.1.pod:194
392 msgid "<piece-name> <piece-upstream-commit-ish>"
396 #: ../git-debrebase.1.pod:196
397 msgid "Specifies that this is a multi-piece upstream. May be repeated."
401 #: ../git-debrebase.1.pod:199
403 "When such a pair is specified, git-debrebase will first combine the pieces "
404 "of the upstream together, and then use the result as the combined new "
409 #: ../git-debrebase.1.pod:204
411 "For each <piece-name>, the tree of the <piece-upstream-commit-ish> becomes "
412 "the subdirectory <piece-name> in the combined new upstream (supplanting any "
413 "subdirectory that might be there in the main upstream branch)."
417 #: ../git-debrebase.1.pod:211
419 "<piece-name> has a restricted syntax: it may contain only ASCII "
420 "alphanumerics and hyphens."
424 #: ../git-debrebase.1.pod:214
426 "The combined upstream is itself recorded as a commit, with each of the "
427 "upstream pieces' commits as parents. The combined commit contains an "
428 "annotation to allow a future git-debrebase new upstream operation to make "
429 "the coherency checks described above."
433 #: ../git-debrebase.1.pod:220
434 msgid "<git-rebase options>"
438 #: ../git-debrebase.1.pod:222
439 msgid "These will be passed to git rebase."
443 #: ../git-debrebase.1.pod:224
445 "If the upstream rebase is troublesome, -i may be helpful. As with plain git-"
446 "debrebase, do not specify a base, or --onto, or --fork-point."
450 #: ../git-debrebase.1.pod:230
452 "If you are planning to generate a .dsc, you will also need to have, or "
453 "generate, actual orig tarball(s), which must be identical to the rev-"
454 "spec(s) passed to git-debrebase. git-debrebase does not concern itself "
455 "with source packages so neither helps with this, nor checks it. L<git-"
456 "deborig(1)>, L<git-archive(1)>, L<dgit(1)> and L<gbp-import-orig(1)> may be "
461 #: ../git-debrebase.1.pod:241
462 msgid "git-debrebase make-patches [--quiet-would-amend]"
466 #: ../git-debrebase.1.pod:243
468 "Generate patches in debian/patches/ representing the changes made to "
473 #: ../git-debrebase.1.pod:246
475 "It is not normally necessary to run this command explicitly. When uploading "
476 "to Debian, dgit and git-debrebase will cooperate to regenerate patches as "
477 "necessary. When working with pure git remotes, the patches are not needed."
481 #: ../git-debrebase.1.pod:253
483 "Normally git-debrebase make-patches will require a laundered branch. (A "
484 "laundered branch does not contain any patches.) But if there are already "
485 "some patches made by git-debrebase make-patches, and all that has happened "
486 "is that more changes to upstream files have been committed, running it again "
487 "can add the missing patches."
491 #: ../git-debrebase.1.pod:262
493 "If the patches implied by the current branch are not a simple superset of "
494 "those already in debian/patches, make-patches will fail with exit status 7, "
495 "and an error message. (The message can be suppressed with --quiet-would-"
496 "amend.) If the problem is simply that the existing patches were not made by "
497 "git-debrebase, using dgit quilt-fixup instead should succeed."
501 #: ../git-debrebase.1.pod:271
502 msgid "git-debrebase convert-from-unapplied [<upstream-commit-ish>]"
506 #: ../git-debrebase.1.pod:273
507 msgid "git-debrebase convert-from-gbp [<upstream-commit-ish>]"
511 #: ../git-debrebase.1.pod:275
512 msgid "Converts any of the following into a git-debrebase interchange branch:"
516 #: ../git-debrebase.1.pod:281
517 msgid "a gbp patches-unapplied branch (but not a gbp pq patch-queue branch)"
521 #: ../git-debrebase.1.pod:285
523 "a patches-unapplied git packaging branch containing debian/patches, as used "
528 #: ../git-debrebase.1.pod:290
530 "a git branch for a package which has no Debian delta - ie where upstream "
531 "files are have not been modified in Debian, so there are no patches"
535 #: ../git-debrebase.1.pod:296
536 msgid "(These two commands operate identically and are simply aliases.)"
540 #: ../git-debrebase.1.pod:298
542 "The conversion is done by generating a new anchor merge, converting any "
543 "quilt patches as a delta queue, and dropping the patches from the tree."
547 #: ../git-debrebase.1.pod:302
549 "The upstream commit-ish should correspond to the upstream branch or tag, if "
550 "there is one. It is a snag if it is not an ancestor of HEAD, or if the "
551 "history between the upstream and HEAD contains commits which make changes to "
552 "upstream files. If it is not specified, the same algorithm is used as for "
553 "git-debrebase new-upstream."
557 #: ../git-debrebase.1.pod:310
559 "It is also a snag if the specified upstream has a debian/ subdirectory. "
560 "This check exists to detect certain likely user errors, but if this "
561 "situation is true and expected, forcing it is fine."
565 #: ../git-debrebase.1.pod:316
567 "git-debrebase will try to look for the dgit archive view of the most recent "
568 "release, and if it finds it will make a pseduomerge so that your new git-"
569 "debrebase view is appropriately fast forward."
573 #: ../git-debrebase.1.pod:321
575 "The result is a well-formed git-debrebase interchange branch. The result is "
576 "also fast-forward from the original branch."
580 #: ../git-debrebase.1.pod:324
582 "It is a snag if the new branch looks like it will have diverged, just as for "
583 "a laundering/unstitching call to git-debrebase; See L</Establish the current "
584 "branch's ffq-prev>, below."
588 #: ../git-debrebase.1.pod:328
590 "Note that it is dangerous not to know whether you are dealing with a (gbp) "
591 "patches-unapplied branch containing quilt patches, or a git-debrebase "
592 "interchange branch. At worst, using the wrong tool for the branch format "
593 "might result in a dropped patch queue!"
597 #: ../git-debrebase.1.pod:337
598 msgid "UNDERLYING AND SUPPLEMENTARY OPERATIONS"
602 #: ../git-debrebase.1.pod:341
603 msgid "git-debrebase breakwater"
607 #: ../git-debrebase.1.pod:343
609 "Prints the breakwater tip commitid. If your HEAD branch is not fully "
610 "laundered, prints the tip of the so-far-laundered breakwater."
614 #: ../git-debrebase.1.pod:347
615 msgid "git-debrebase anchor"
619 #: ../git-debrebase.1.pod:349
620 msgid "Prints the breakwater anchor commitid."
624 #: ../git-debrebase.1.pod:351
625 msgid "git-debrebase analyse"
629 #: ../git-debrebase.1.pod:353
631 "Walks the history of the current branch, most recent commit first, back "
632 "until the most recent anchor, printing the commit object id, and commit type "
633 "and info (ie the semantics in the git-debrebase model) for each commit."
637 #: ../git-debrebase.1.pod:361
638 msgid "git-debrebase record-ffq-prev"
642 #: ../git-debrebase.1.pod:363
644 "Establishes the current branch's ffq-prev, as discussed in L</UNSTITCHING "
645 "AND LAUNDERING>, but does not launder the branch or move HEAD."
649 #: ../git-debrebase.1.pod:367
651 "It is an error if the ffq-prev could not be recorded. It is also an error "
652 "if an ffq-prev has already been recorded, unless --noop-ok."
656 #: ../git-debrebase.1.pod:371
657 msgid "git-debrebase launder-v0"
661 #: ../git-debrebase.1.pod:373
663 "Launders the branch without recording anything in ffq-prev. Then prints "
664 "some information about the current branch. Do not use this operation; it "
665 "will be withdrawn soon."
669 #: ../git-debrebase.1.pod:378
670 msgid "git-debrebase convert-to-gbp"
674 #: ../git-debrebase.1.pod:380
676 "Converts a laundered branch into a gbp patches-unapplied branch containing "
677 "quilt patches. The result is not fast forward from the interchange branch, "
678 "and any ffq-prev is deleted."
682 #: ../git-debrebase.1.pod:385
684 "This is provided mostly for the test suite and for unusual situations. It "
685 "should only be used with care and with a proper understanding of the "
690 #: ../git-debrebase.1.pod:390
692 "Be sure to not accidentally treat the result as a git-debrebase branch, or "
693 "you will drop all the patches!"
697 #: ../git-debrebase.1.pod:394
698 msgid "git-debrebase convert-from-dgit-view [<convert-options>] [upstream]"
702 #: ../git-debrebase.1.pod:396
704 "Converts any dgit-compatible git branch corresponding to a (possibly "
705 "hypothetical) 3.0 quilt dsc source package into a git-debrebase-compatible "
710 #: ../git-debrebase.1.pod:400
712 "This operation should not be used if the branch is already in git-debrebase "
713 "form. Normally git-debrebase will refuse to continue in this case (or "
714 "silently do nothing if the global --noop-ok option is used)."
718 #: ../git-debrebase.1.pod:405
720 "Some representation of the original upstream source code will be needed. If "
721 "I<upstream> is supplied, that must be a suitable upstream commit. By "
722 "default, git-debrebase will look first for git tags (as for new-upstream), "
723 "and then for orig tarballs which it will ask dgit to process."
727 #: ../git-debrebase.1.pod:411
729 "The upstream source must be exactly right and all the patches in debian/"
730 "patches must be up to date. Applying the patches from debian/patches to the "
731 "upstream source must result in exactly your HEAD."
735 #: ../git-debrebase.1.pod:416
737 "The output is laundered and stitched. The resulting history is not "
738 "particularly pretty, especially if orig tarball(s) were imported to produce "
739 "a synthetic upstream commit."
743 #: ../git-debrebase.1.pod:421
745 "The available convert-options are as follows. (These must come after "
746 "convert-from-dgit-view.)"
750 #: ../git-debrebase.1.pod:426
751 msgid "--[no-]diagnose"
755 #: ../git-debrebase.1.pod:428
757 "Print additional error messages to help diagnose failure to find an "
758 "appropriate upstream. --no-diagnose is the default."
762 #: ../git-debrebase.1.pod:432
763 msgid "--build-products-dir"
767 #: ../git-debrebase.1.pod:434
769 "Directory to look in for orig tarballs. The default is the git config "
770 "option dgit.default.build-products-dir or failing that, C<..>. Passed on to "
771 "dgit, if git-debrebase invokes dgit."
775 #: ../git-debrebase.1.pod:440
780 #: ../git-debrebase.1.pod:442
782 "Whether to try to look for or use any orig tarballs. --origs is the default."
786 #: ../git-debrebase.1.pod:445
791 #: ../git-debrebase.1.pod:447
793 "Whether to try to look for or use any upstream git tags. --tags is the "
798 #: ../git-debrebase.1.pod:450
799 msgid "--always-convert-anyway"
803 #: ../git-debrebase.1.pod:452
805 "Perform the conversion operation, producing unpleasant extra history, even "
806 "if the branch seems to be in git-debrebase form already. This should not be "
807 "done unless necessary, and it should not be necessary."
811 #: ../git-debrebase.1.pod:460
812 msgid "git-debrebase forget-was-ever-debrebase"
816 #: ../git-debrebase.1.pod:462
818 "Deletes the ffq-prev and debrebase-last refs associated with this branch, "
819 "that git-debrebase and dgit use to determine whether this branch is managed "
820 "by git-debrebase, and what previous head may need to be stitched back in."
824 #: ../git-debrebase.1.pod:468
826 "This can be useful if you were just playing with git-debrebase, and have "
827 "used git-reset --hard to go back to a commit before your experiments."
831 #: ../git-debrebase.1.pod:472
832 msgid "Do not use this if you expect to run git-debrebase on the branch again."
836 #: ../git-debrebase.1.pod:478
838 "This section documents the general options to git-debrebase (ie, the ones "
839 "which immediately follow git-debrebase or git debrebase on the command "
840 "line). Individual operations may have their own options which are docuented "
841 "under each operation."
845 #: ../git-debrebase.1.pod:490
850 #: ../git-debrebase.1.pod:492
851 msgid "Turns snag(s) with id <snag-id> into warnings."
855 #: ../git-debrebase.1.pod:494
857 "Some troublesome things which git-debrebase encounters are B<snag>s. (The "
858 "specific instances are discussed in the text for the relevant operation.)"
862 #: ../git-debrebase.1.pod:499
864 "When a snag is detected, a message is printed to stderr containing the snag "
865 "id (in the form C<-f<snag-idE<gt>>), along with some prose."
869 #: ../git-debrebase.1.pod:504
871 "If snags are detected, git-debrebase does not continue, unless the relevant -"
872 "f<snag-id> is specified, or --force is specified."
876 #: ../git-debrebase.1.pod:508
881 #: ../git-debrebase.1.pod:510
882 msgid "Turns all snags into warnings. See the -f<snag-id> option."
886 #: ../git-debrebase.1.pod:513
888 "Do not invoke git-debrebase --force in scripts and aliases; instead, specify "
889 "the particular -f<snag-id> for expected snags."
893 #: ../git-debrebase.1.pod:516
898 #: ../git-debrebase.1.pod:518
900 "Suppresses the error in some situations where git-debrebase does nothing, "
901 "because there is nothing to do."
905 #: ../git-debrebase.1.pod:522
907 "The specific instances are discussed in the text for the relvant operation."
911 #: ../git-debrebase.1.pod:525
912 msgid "--anchor=<commit-ish>"
916 #: ../git-debrebase.1.pod:527
918 "Treats <commit-ish> as an anchor. This overrides the usual logic which "
919 "automatically classifies commits as anchors, pseudomerges, delta queue "
924 #: ../git-debrebase.1.pod:531
926 "It also disables some coherency checks which depend on metadata extracted "
927 "from its commit message, so it is a snag if <commit-ish> is the anchor for "
928 "the previous upstream version in git-debrebase new-upstream operations."
932 #: ../git-debrebase.1.pod:538
933 msgid "--dgit=<program>"
937 #: ../git-debrebase.1.pod:540
939 "Run <program>, instead of dgit from PATH, when invocation of dgit is "
940 "necessary. This is provided mostly for the benefit of the test suite."
944 #: ../git-debrebase.1.pod:544
949 #: ../git-debrebase.1.pod:546
950 msgid "Requests (more) debugging. May be repeated."
954 #: ../git-debrebase.1.pod:548
955 msgid "--experimental-merge-resolution"
959 #: ../git-debrebase.1.pod:550
961 "Enable experimental code for handling general merges (see L<git-debrebase(5)/"
966 #: ../git-debrebase.1.pod:553
968 "This option may generate lossage of various kinds, including misleading "
969 "error messages, references to nonexistent documentation, and you being "
970 "handed an incomprehensible pile of multidimensional merge wreckage."
974 #: ../git-debrebase.1.pod:561
975 msgid "UNSTITCHING AND LAUNDERING"
979 #: ../git-debrebase.1.pod:563
981 "Several operations unstitch and launder the branch first. In detail this "
986 #: ../git-debrebase.1.pod:566
987 msgid "Establish the current branch's ffq-prev"
991 #: ../git-debrebase.1.pod:568
993 "If ffq-prev is not yet recorded, git-debrebase checks that the current "
994 "branch is ahead of relevant remote tracking branches. The relevant branches "
995 "depend on the current branch (and its git configuration) and are as follows:"
999 #: ../git-debrebase.1.pod:580
1001 "The branch that git would merge from (remote.<branch>.merge, remote.<branch>."
1006 #: ../git-debrebase.1.pod:585
1008 "The branch git would push to, if different (remote.<branch>.pushRemote etc.);"
1012 #: ../git-debrebase.1.pod:590
1013 msgid "For local dgit suite branches, the corresponding tracking remote;"
1017 #: ../git-debrebase.1.pod:595
1018 msgid "If you are on C<master>, remotes/dgit/dgit/sid."
1022 #: ../git-debrebase.1.pod:600
1024 "The apparently relevant ref names to check are filtered through branch."
1025 "<branch>.ffq-ffrefs, which is a semicolon-separated list of glob patterns, "
1026 "each optionally preceded by !; first match wins."
1030 #: ../git-debrebase.1.pod:605
1032 "In each case it is a snag if the local HEAD is behind the checked remote, or "
1033 "if local HEAD has diverged from it. All the checks are done locally using "
1034 "the remote tracking refs: git-debrebase does not fetch anything from "
1039 #: ../git-debrebase.1.pod:611
1041 "If these checks pass, or are forced, git-debrebse then records the current "
1046 #: ../git-debrebase.1.pod:615
1047 msgid "Examine the branch"
1051 #: ../git-debrebase.1.pod:617
1053 "git-debrebase analyses the current HEAD's history to find the anchor in its "
1054 "breakwater, and the most recent breakwater tip."
1058 #: ../git-debrebase.1.pod:622
1059 msgid "Rewrite the commits into laundered form"
1063 #: ../git-debrebase.1.pod:624
1065 "Mixed debian+upstream commits are split into two commits each. Delta queue "
1066 "(upstream files) commits bubble to the top. Pseudomerges, and quilt patch "
1067 "additions, are dropped."
1071 #: ../git-debrebase.1.pod:630
1073 "This rewrite will always succeed, by construction. The result is the "
1078 #: ../git-debrebase.1.pod:635
1079 msgid "git-debrebase(1), dgit-maint-debrebase(7), dgit(1), gitglossary(7)"