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-03-01 16:59+0000\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 #: ../git-debrebase.1.pod:1 ../git-debrebase.5.pod:1
30 #: ../dgit.1:496 ../git-debrebase.1.pod:462
36 #: ../dgit.1:1470 ../dgit.7:23 ../dgit-user.7.pod:447
37 #: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126
38 #: ../dgit-maint-merge.7.pod:491 ../dgit-maint-gbp.7.pod:136
39 #: ../dgit-maint-debrebase.7.pod:747 ../dgit-downstream-dsc.7.pod:352
40 #: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:619
41 #: ../git-debrebase.5.pod:678
47 #: ../dgit-user.7.pod:5 ../dgit-maint-native.7.pod:5
48 #: ../dgit-maint-merge.7.pod:5 ../dgit-maint-gbp.7.pod:5
49 #: ../dgit-maint-debrebase.7.pod:5 ../dgit-downstream-dsc.7.pod:5
50 #: ../git-debrebase.1.pod:10 ../git-debrebase.5.pod:5
55 #: ../git-debrebase.1.pod:3
56 msgid "git-debrebase - delta queue rebase tool for Debian packaging"
60 #: ../git-debrebase.1.pod:5
65 #: ../git-debrebase.1.pod:7
68 " git-debrebase [<options...>] [-- <git-rebase options...>]\n"
69 " git-debrebase [<options...>] <operation> [<operation options...>\n"
74 #: ../git-debrebase.1.pod:12 ../git-debrebase.5.pod:7
76 "git-debrebase is a tool for representing in git, and manpulating, Debian "
77 "packages based on upstream source code."
81 #: ../git-debrebase.1.pod:16
83 "This is the command line reference. Please read the tutorial L<dgit-maint-"
84 "debrebase(7)>. For background, theory of operation, and definitions see "
85 "L<git-debrebase(5)>."
89 #: ../git-debrebase.1.pod:22
91 "You should read this manpage in conjunction with L<git-debrebase(5)/"
92 "TERMINOLOGY>, which defines many important terms used here."
96 #: ../git-debrebase.1.pod:26
97 msgid "PRINCIPAL OPERATIONS"
101 #: ../git-debrebase.1.pod:30
102 msgid "git-debrebase [-- <git-rebase options...>]"
106 #: ../git-debrebase.1.pod:32
107 msgid "git-debrebase [-i <further git-rebase options...>]"
111 #: ../git-debrebase.1.pod:34
113 "Unstitches and launders the branch. (See L</UNSTITCHING AND LAUNDERING> "
118 #: ../git-debrebase.1.pod:37
120 "Then, if any git-rebase options were supplied, edits the Debian delta queue, "
121 "using git-rebase, by running"
125 #: ../git-debrebase.1.pod:41
128 " git rebase <git-rebase options> <breakwater-tip>\n"
133 #: ../git-debrebase.1.pod:43
135 "Do not pass a base branch argument: git-debrebase will supply that. Do not "
136 "use --onto, or --fork-point. Useful git-rebase options include -i and --"
141 #: ../git-debrebase.1.pod:48
143 "If git-rebase stops for any reason, you may git-rebase --abort, --continue, "
144 "or --skip, as usual. If you abort the git-rebase, the branch will still "
145 "have been laundered, but everything in the rebase will be undone."
149 #: ../git-debrebase.1.pod:54
151 "The options for git-rebase must either start with C<-i>, or be prececded by "
152 "C<-->, to distinguish them from options for git-debrebase."
156 #: ../git-debrebase.1.pod:58
158 "It is hazardous to use plain git-rebase on a git-debrebase branch, because "
159 "git-rebase has a tendency to start the rebase too far back in history, and "
160 "then drop important commits. See L<git-debrebase(5)/ILLEGAL OPERATIONS>"
164 #: ../git-debrebase.1.pod:64
165 msgid "git-debrebase status"
169 #: ../git-debrebase.1.pod:66
171 "Analyses the current branch, both in terms of its contents, and the refs "
172 "which are relevant to git-debrebase, and prints a human-readable summary."
176 #: ../git-debrebase.1.pod:71
178 "Please do not attempt to parse the output; it may be reformatted or "
179 "reorganised in the future. Instead, use one of the L<UNDERLYING AND "
180 "SUPPLEMENTARY OPERATIONS> described below."
184 #: ../git-debrebase.1.pod:77
185 msgid "git-debrebase conclude"
189 #: ../git-debrebase.1.pod:79
191 "Finishes a git-debrebase session, tidying up the branch and making it fast "
196 #: ../git-debrebase.1.pod:82
198 "Specifically: if the branch is unstitched, launders and restitches it, "
199 "making a new pseudomerge. Otherwise, it is an error, unless --noop-ok."
203 #: ../git-debrebase.1.pod:88
204 msgid "git-debrebase quick"
208 #: ../git-debrebase.1.pod:90
210 "Unconditionally launders and restitches the branch, consuming any ffq-prev "
211 "and making a new pseudomerge."
215 #: ../git-debrebase.1.pod:94
216 msgid "If the branch is already laundered and stitched, does nothing."
220 #: ../git-debrebase.1.pod:96
221 msgid "git-debrebase prepush [--prose=<for commit message>]"
225 #: ../git-debrebase.1.pod:98
226 msgid "If the branch is unstitched, stitches it, consuming ffq-prev."
230 #: ../git-debrebase.1.pod:102
232 "This is a good command to run before pushing to a git server. You should "
233 "consider using B<conclude> instead, because that launders the branch too."
237 #: ../git-debrebase.1.pod:106
238 msgid "git-debrebase stitch [--prose=<for commit message>]"
242 #: ../git-debrebase.1.pod:108
243 msgid "Stitches the branch, consuming ffq-prev."
247 #: ../git-debrebase.1.pod:111
248 msgid "If there is no ffq-prev, it is an error, unless --noop-ok."
252 #: ../git-debrebase.1.pod:113
253 msgid "You should consider using B<prepush> or B<conclude> instead."
257 #: ../git-debrebase.1.pod:115
258 msgid "git-debrebase scrap"
262 #: ../git-debrebase.1.pod:117
264 "Throws away all the work since the branch was last stitched. This is done "
265 "by rewinding you to ffq-prev."
269 #: ../git-debrebase.1.pod:120
270 msgid "If you are in the middle of a git-rebase, will abort that too."
274 #: ../git-debrebase.1.pod:122
275 msgid "git-debrebase new-upstream <new-version> [<upstream-details>...]"
279 #: ../git-debrebase.1.pod:124
280 msgid "Rebases the delta queue onto a new upstream version. In detail:"
284 #: ../git-debrebase.1.pod:127
286 "Firstly, checks that the proposed rebase seems to make sense: It is a snag "
287 "unless the new upstream(s) are fast forward from the previous upstream(s) "
288 "as found in the current breakwater anchor. And, in the case of a multi-"
289 "piece upstream (a multi-component upstream, in dpkg-source terminology), if "
290 "the pieces are not in the same order, with the same names."
294 #: ../git-debrebase.1.pod:135
295 msgid "If all seems well, unstitches and launders the branch."
299 #: ../git-debrebase.1.pod:137
301 "Then, generates (in a private working area) a new anchor merge commit, on "
302 "top of the breakwater tip, and on top of that a commit to update the version "
303 "number in debian/changelog."
307 #: ../git-debrebase.1.pod:145
308 msgid "Finally, starts a git-rebase of the delta queue onto these new commits."
312 #: ../git-debrebase.1.pod:149
314 "That git-rebase may complete successfully, or it may require your "
315 "assistance, just like a normal git-rebase."
319 #: ../git-debrebase.1.pod:153
321 "If you git-rebase --abort, the whole new upstream operation is aborted, "
322 "except for the laundering."
326 #: ../git-debrebase.1.pod:157
328 "<new-version> may be a whole new Debian version, including revision, or just "
329 "the upstream part, in which case -1 will be appended to make the new Debian "
334 #: ../git-debrebase.1.pod:163
335 msgid "The <upstream-details> are, optionally, in order:"
339 #: ../git-debrebase.1.pod:167
340 msgid "<upstream-commit-ish>"
344 #: ../git-debrebase.1.pod:169
346 "The new upstream branch (or commit-ish). The default is to look for one of "
347 "these tags, in this order: U vU upstream/U; where U is the new upstream "
348 "version. (This is the same algorithm as L<git-deborig(1)>.)"
352 #: ../git-debrebase.1.pod:175
354 "It is a snag if the upstream contains a debian/ directory; if forced to "
355 "proceed, git-debrebase will disregard the upstream's debian/ and take (only) "
356 "the packaging from the current breakwater."
360 #: ../git-debrebase.1.pod:180
361 msgid "<piece-name> <piece-upstream-commit-ish>"
365 #: ../git-debrebase.1.pod:182
366 msgid "Specifies that this is a multi-piece upstream. May be repeated."
370 #: ../git-debrebase.1.pod:185
372 "When such a pair is specified, git-debrebase will first combine the pieces "
373 "of the upstream together, and then use the result as the combined new "
378 #: ../git-debrebase.1.pod:190
380 "For each <piece-name>, the tree of the <piece-upstream-commit-ish> becomes "
381 "the subdirectory <piece-name> in the combined new upstream (supplanting any "
382 "subdirectory that might be there in the main upstream branch)."
386 #: ../git-debrebase.1.pod:197
388 "<piece-name> has a restricted syntax: it may contain only ASCII "
389 "alphanumerics and hyphens."
393 #: ../git-debrebase.1.pod:200
395 "The combined upstream is itself recorded as a commit, with each of the "
396 "upstream pieces' commits as parents. The combined commit contains an "
397 "annotation to allow a future git-debrebase new upstream operation to make "
398 "the coherency checks described above."
402 #: ../git-debrebase.1.pod:206
403 msgid "<git-rebase options>"
407 #: ../git-debrebase.1.pod:208
408 msgid "These will be passed to git rebase."
412 #: ../git-debrebase.1.pod:210
414 "If the upstream rebase is troublesome, -i may be helpful. As with plain git-"
415 "debrebase, do not specify a base, or --onto, or --fork-point."
419 #: ../git-debrebase.1.pod:216
421 "If you are planning to generate a .dsc, you will also need to have, or "
422 "generate, actual orig tarball(s), which must be identical to the rev-"
423 "spec(s) passed to git-debrebase. git-debrebase does not concern itself "
424 "with source packages so neither helps with this, nor checks it. L<git-"
425 "deborig(1)>, L<git-archive(1)>, L<dgit(1)> and L<gbp-import-orig(1)> may be "
430 #: ../git-debrebase.1.pod:227
431 msgid "git-debrebase make-patches [--quiet-would-amend]"
435 #: ../git-debrebase.1.pod:229
437 "Generate patches in debian/patches/ representing the changes made to "
442 #: ../git-debrebase.1.pod:232
444 "It is not normally necessary to run this command explicitly. When uploading "
445 "to Debian, dgit and git-debrebase will cooperate to regenerate patches as "
446 "necessary. When working with pure git remotes, the patches are not needed."
450 #: ../git-debrebase.1.pod:239
452 "Normally git-debrebase make-patches will require a laundered branch. (A "
453 "laundered branch does not contain any patches.) But if there are already "
454 "some patches made by git-debrebase make-patches, and all that has happened "
455 "is that more changes to upstream files have been committed, running it again "
456 "can add the missing patches."
460 #: ../git-debrebase.1.pod:248
462 "If the patches implied by the current branch are not a simple superset of "
463 "those already in debian/patches, make-patches will fail with exit status 7, "
464 "and an error message. (The message can be suppressed with --quiet-would-"
465 "amend.) If the problem is simply that the existing patches were not made by "
466 "git-debrebase, using dgit quilt-fixup instead should succeed."
470 #: ../git-debrebase.1.pod:257
471 msgid "git-debrebase convert-from-unapplied [<upstream-commit-ish>]"
475 #: ../git-debrebase.1.pod:259
476 msgid "git-debrebase convert-from-gbp [<upstream-commit-ish>]"
480 #: ../git-debrebase.1.pod:261
481 msgid "Converts any of the following into a git-debrebase interchange branch:"
485 #: ../git-debrebase.1.pod:267
486 msgid "a gbp patches-unapplied branch (but not a gbp pq patch-queue branch)"
490 #: ../git-debrebase.1.pod:271
492 "a patches-unapplied git packaging branch containing debian/patches, as used "
497 #: ../git-debrebase.1.pod:276
499 "a git branch for a package which has no Debian delta - ie where upstream "
500 "files are have not been modified in Debian, so there are no patches"
504 #: ../git-debrebase.1.pod:282
505 msgid "(These two commands operate identically and are simply aliases.)"
509 #: ../git-debrebase.1.pod:284
511 "The conversion is done by generating a new anchor merge, converting any "
512 "quilt patches as a delta queue, and dropping the patches from the tree."
516 #: ../git-debrebase.1.pod:288
518 "The upstream commit-ish should correspond to the upstream branch or tag, if "
519 "there is one. It is a snag if it is not an ancestor of HEAD, or if the "
520 "history between the upstream and HEAD contains commits which make changes to "
521 "upstream files. If it is not specified, the same algorithm is used as for "
522 "git-debrebase new-upstream."
526 #: ../git-debrebase.1.pod:296
528 "It is also a snag if the specified upstream has a debian/ subdirectory. "
529 "This check exists to detect certain likely user errors, but if this "
530 "situation is true and expected, forcing it is fine."
534 #: ../git-debrebase.1.pod:302
536 "git-debrebase will try to look for the dgit archive view of the most recent "
537 "release, and if it finds it will make a pseduomerge so that your new git-"
538 "debrebase view is appropriately fast forward."
542 #: ../git-debrebase.1.pod:307
544 "The result is a well-formed git-debrebase interchange branch. The result is "
545 "also fast-forward from the original branch."
549 #: ../git-debrebase.1.pod:310
551 "It is a snag if the new branch looks like it will have diverged, just as for "
552 "a laundering/unstitching call to git-debrebase; See L</Establish the current "
553 "branch's ffq-prev>, below."
557 #: ../git-debrebase.1.pod:314
559 "Note that it is dangerous not to know whether you are dealing with a (gbp) "
560 "patches-unapplied branch containing quilt patches, or a git-debrebase "
561 "interchange branch. At worst, using the wrong tool for the branch format "
562 "might result in a dropped patch queue!"
566 #: ../git-debrebase.1.pod:323
567 msgid "UNDERLYING AND SUPPLEMENTARY OPERATIONS"
571 #: ../git-debrebase.1.pod:327
572 msgid "git-debrebase breakwater"
576 #: ../git-debrebase.1.pod:329
578 "Prints the breakwater tip commitid. If your HEAD branch is not fully "
579 "laundered, prints the tip of the so-far-laundered breakwater."
583 #: ../git-debrebase.1.pod:333
584 msgid "git-debrebase anchor"
588 #: ../git-debrebase.1.pod:335
589 msgid "Prints the breakwater anchor commitid."
593 #: ../git-debrebase.1.pod:337
594 msgid "git-debrebase analyse"
598 #: ../git-debrebase.1.pod:339
600 "Walks the history of the current branch, most recent commit first, back "
601 "until the most recent anchor, printing the commit object id, and commit type "
602 "and info (ie the semantics in the git-debrebase model) for each commit."
606 #: ../git-debrebase.1.pod:347
607 msgid "git-debrebase record-ffq-prev"
611 #: ../git-debrebase.1.pod:349
613 "Establishes the current branch's ffq-prev, as discussed in L</UNSTITCHING "
614 "AND LAUNDERING>, but does not launder the branch or move HEAD."
618 #: ../git-debrebase.1.pod:353
620 "It is an error if the ffq-prev could not be recorded. It is also an error "
621 "if an ffq-prev has already been recorded, unless --noop-ok."
625 #: ../git-debrebase.1.pod:357
626 msgid "git-debrebase launder-v0"
630 #: ../git-debrebase.1.pod:359
632 "Launders the branch without recording anything in ffq-prev. Then prints "
633 "some information about the current branch. Do not use this operation; it "
634 "will be withdrawn soon."
638 #: ../git-debrebase.1.pod:364
639 msgid "git-debrebase convert-to-gbp"
643 #: ../git-debrebase.1.pod:366
645 "Converts a laundered branch into a gbp patches-unapplied branch containing "
646 "quilt patches. The result is not fast forward from the interchange branch, "
647 "and any ffq-prev is deleted."
651 #: ../git-debrebase.1.pod:371
653 "This is provided mostly for the test suite and for unusual situations. It "
654 "should only be used with care and with a proper understanding of the "
659 #: ../git-debrebase.1.pod:376
661 "Be sure to not accidentally treat the result as a git-debrebase branch, or "
662 "you will drop all the patches!"
666 #: ../git-debrebase.1.pod:380
667 msgid "git-debrebase convert-from-dgit-view [<convert-options>] [upstream]"
671 #: ../git-debrebase.1.pod:382
673 "Converts any dgit-compatible git branch corresponding to a (possibly "
674 "hypothetical) 3.0 quilt dsc source package into a git-debrebase-compatible "
679 #: ../git-debrebase.1.pod:386
681 "This operation should not be used if the branch is already in git-debrebase "
682 "form. Normally git-debrebase will refuse to continue in this case (or "
683 "silently do nothing if the global --noop-ok option is used)."
687 #: ../git-debrebase.1.pod:391
689 "Some representation of the original upstream source code will be needed. If "
690 "I<upstream> is supplied, that must be a suitable upstream commit. By "
691 "default, git-debrebase will look first for git tags (as for new-upstream), "
692 "and then for orig tarballs which it will ask dgit to process."
696 #: ../git-debrebase.1.pod:397
698 "The upstream source must be exactly right and all the patches in debian/"
699 "patches must be up to date. Applying the patches from debian/patches to the "
700 "upstream source must result in exactly your HEAD."
704 #: ../git-debrebase.1.pod:402
706 "The output is laundered and stitched. The resulting history is not "
707 "particularly pretty, especially if orig tarball(s) were imported to produce "
708 "a synthetic upstream commit."
712 #: ../git-debrebase.1.pod:407
714 "The available convert-options are as follows. (These must come after "
715 "convert-from-dgit-view.)"
719 #: ../git-debrebase.1.pod:412
720 msgid "--[no-]diagnose"
724 #: ../git-debrebase.1.pod:414
726 "Print additional error messages to help diagnose failure to find an "
727 "appropriate upstream. --no-diagnose is the default."
731 #: ../git-debrebase.1.pod:418
732 msgid "--build-products-dir"
736 #: ../git-debrebase.1.pod:420
738 "Directory to look in for orig tarballs. The default is the git config "
739 "option dgit.default.build-products-dir or failing that, C<..>. Passed on to "
740 "dgit, if git-debrebase invokes dgit."
744 #: ../git-debrebase.1.pod:426
749 #: ../git-debrebase.1.pod:428
751 "Whether to try to look for or use any orig tarballs. --origs is the default."
755 #: ../git-debrebase.1.pod:431
760 #: ../git-debrebase.1.pod:433
762 "Whether to try to look for or use any upstream git tags. --tags is the "
767 #: ../git-debrebase.1.pod:436
768 msgid "--always-convert-anyway"
772 #: ../git-debrebase.1.pod:438
774 "Perform the conversion operation, producing unpleasant extra history, even "
775 "if the branch seems to be in git-debrebase form already. This should not be "
776 "done unless necessary, and it should not be necessary."
780 #: ../git-debrebase.1.pod:446
781 msgid "git-debrebase forget-was-ever-debrebase"
785 #: ../git-debrebase.1.pod:448
787 "Deletes the ffq-prev and debrebase-last refs associated with this branch, "
788 "that git-debrebase and dgit use to determine whether this branch is managed "
789 "by git-debrebase, and what previous head may need to be stitched back in."
793 #: ../git-debrebase.1.pod:454
795 "This can be useful if you were just playing with git-debrebase, and have "
796 "used git-reset --hard to go back to a commit before your experiments."
800 #: ../git-debrebase.1.pod:458
801 msgid "Do not use this if you expect to run git-debrebase on the branch again."
805 #: ../git-debrebase.1.pod:464
807 "This section documents the general options to git-debrebase (ie, the ones "
808 "which immediately follow git-debrebase or git debrebase on the command "
809 "line). Individual operations may have their own options which are docuented "
810 "under each operation."
814 #: ../git-debrebase.1.pod:476
819 #: ../git-debrebase.1.pod:478
820 msgid "Turns snag(s) with id <snag-id> into warnings."
824 #: ../git-debrebase.1.pod:480
826 "Some troublesome things which git-debrebase encounters are B<snag>s. (The "
827 "specific instances are discussed in the text for the relevant operation.)"
831 #: ../git-debrebase.1.pod:485
833 "When a snag is detected, a message is printed to stderr containing the snag "
834 "id (in the form C<-f<snag-idE<gt>>), along with some prose."
838 #: ../git-debrebase.1.pod:490
840 "If snags are detected, git-debrebase does not continue, unless the relevant -"
841 "f<snag-id> is specified, or --force is specified."
845 #: ../git-debrebase.1.pod:494
850 #: ../git-debrebase.1.pod:496
851 msgid "Turns all snags into warnings. See the -f<snag-id> option."
855 #: ../git-debrebase.1.pod:499
857 "Do not invoke git-debrebase --force in scripts and aliases; instead, specify "
858 "the particular -f<snag-id> for expected snags."
862 #: ../git-debrebase.1.pod:502
867 #: ../git-debrebase.1.pod:504
869 "Suppresses the error in some situations where git-debrebase does nothing, "
870 "because there is nothing to do."
874 #: ../git-debrebase.1.pod:508
876 "The specific instances are discussed in the text for the relvant operation."
880 #: ../git-debrebase.1.pod:511
881 msgid "--anchor=<commit-ish>"
885 #: ../git-debrebase.1.pod:513
887 "Treats <commit-ish> as an anchor. This overrides the usual logic which "
888 "automatically classifies commits as anchors, pseudomerges, delta queue "
893 #: ../git-debrebase.1.pod:517
895 "It also disables some coherency checks which depend on metadata extracted "
896 "from its commit message, so it is a snag if <commit-ish> is the anchor for "
897 "the previous upstream version in git-debrebase new-upstream operations."
901 #: ../git-debrebase.1.pod:524
902 msgid "--dgit=<program>"
906 #: ../git-debrebase.1.pod:526
908 "Run <program>, instead of dgit from PATH, when invocation of dgit is "
909 "necessary. This is provided mostly for the benefit of the test suite."
913 #: ../git-debrebase.1.pod:530
918 #: ../git-debrebase.1.pod:532
919 msgid "Requests (more) debugging. May be repeated."
923 #: ../git-debrebase.1.pod:534
924 msgid "--experimntal-merge-resolution"
928 #: ../git-debrebase.1.pod:536
930 "Enable experimental code for handling general merges (see L<git-debrebase(5)/"
935 #: ../git-debrebase.1.pod:539
937 "This option may generate lossage of various kinds, including misleading "
938 "error messages, references to nonexistent documentation, and you being "
939 "handed an incomprehensible pile of multidimensional merge wreckage."
943 #: ../git-debrebase.1.pod:547
944 msgid "UNSTITCHING AND LAUNDERING"
948 #: ../git-debrebase.1.pod:549
950 "Several operations unstitch and launder the branch first. In detail this "
955 #: ../git-debrebase.1.pod:552
956 msgid "Establish the current branch's ffq-prev"
960 #: ../git-debrebase.1.pod:554
962 "If ffq-prev is not yet recorded, git-debrebase checks that the current "
963 "branch is ahead of relevant remote tracking branches. The relevant branches "
964 "depend on the current branch (and its git configuration) and are as follows:"
968 #: ../git-debrebase.1.pod:566
970 "The branch that git would merge from (remote.<branch>.merge, remote.<branch>."
975 #: ../git-debrebase.1.pod:571
977 "The branch git would push to, if different (remote.<branch>.pushRemote etc.);"
981 #: ../git-debrebase.1.pod:576
982 msgid "For local dgit suite branches, the corresponding tracking remote;"
986 #: ../git-debrebase.1.pod:581
987 msgid "If you are on C<master>, remotes/dgit/dgit/sid."
991 #: ../git-debrebase.1.pod:586
993 "The apparently relevant ref names to check are filtered through branch."
994 "<branch>.ffq-ffrefs, which is a semicolon-separated list of glob patterns, "
995 "each optionally preceded by !; first match wins."
999 #: ../git-debrebase.1.pod:591
1001 "In each case it is a snag if the local HEAD is behind the checked remote, or "
1002 "if local HEAD has diverged from it. All the checks are done locally using "
1003 "the remote tracking refs: git-debrebase does not fetch anything from "
1008 #: ../git-debrebase.1.pod:597
1010 "If these checks pass, or are forced, git-debrebse then records the current "
1015 #: ../git-debrebase.1.pod:601
1016 msgid "Examine the branch"
1020 #: ../git-debrebase.1.pod:603
1022 "git-debrebase analyses the current HEAD's history to find the anchor in its "
1023 "breakwater, and the most recent breakwater tip."
1027 #: ../git-debrebase.1.pod:608
1028 msgid "Rewrite the commits into laundered form"
1032 #: ../git-debrebase.1.pod:610
1034 "Mixed debian+upstream commits are split into two commits each. Delta queue "
1035 "(upstream files) commits bubble to the top. Pseudomerges, and quilt patch "
1036 "additions, are dropped."
1040 #: ../git-debrebase.1.pod:616
1042 "This rewrite will always succeed, by construction. The result is the "
1047 #: ../git-debrebase.1.pod:621
1048 msgid "git-debrebase(1), dgit-maint-rebase(7), dgit(1), gitglossary(7)"