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-07-21 01:37+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:462
37 #: ../dgit.1:1549 ../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:619 ../git-debrebase.5.pod:678
43 #: ../git-debpush.1.pod:223
49 #: ../dgit-user.7.pod:5 ../dgit-maint-native.7.pod:5
50 #: ../dgit-maint-merge.7.pod:5 ../dgit-maint-gbp.7.pod:5
51 #: ../dgit-maint-debrebase.7.pod:5 ../dgit-downstream-dsc.7.pod:5
52 #: ../dgit-maint-bpo.7.pod:5 ../git-debrebase.1.pod:10 ../git-debrebase.5.pod:5
57 #: ../git-debrebase.1.pod:3
58 msgid "git-debrebase - delta queue rebase tool for Debian packaging"
62 #: ../git-debrebase.1.pod:5
67 #: ../git-debrebase.1.pod:7
70 " git-debrebase [<options...>] [-- <git-rebase options...>]\n"
71 " git-debrebase [<options...>] <operation> [<operation options...>\n"
76 #: ../git-debrebase.1.pod:12 ../git-debrebase.5.pod:7
78 "git-debrebase is a tool for representing in git, and manpulating, Debian "
79 "packages based on upstream source code."
83 #: ../git-debrebase.1.pod:16
85 "This is the command line reference. Please read the tutorial L<dgit-maint-"
86 "debrebase(7)>. For background, theory of operation, and definitions see "
87 "L<git-debrebase(5)>."
91 #: ../git-debrebase.1.pod:22
93 "You should read this manpage in conjunction with L<git-debrebase(5)/"
94 "TERMINOLOGY>, which defines many important terms used here."
98 #: ../git-debrebase.1.pod:26
99 msgid "PRINCIPAL OPERATIONS"
103 #: ../git-debrebase.1.pod:30
104 msgid "git-debrebase [-- <git-rebase options...>]"
108 #: ../git-debrebase.1.pod:32
109 msgid "git-debrebase [-i <further git-rebase options...>]"
113 #: ../git-debrebase.1.pod:34
115 "Unstitches and launders the branch. (See L</UNSTITCHING AND LAUNDERING> "
120 #: ../git-debrebase.1.pod:37
122 "Then, if any git-rebase options were supplied, edits the Debian delta queue, "
123 "using git-rebase, by running"
127 #: ../git-debrebase.1.pod:41
130 " git rebase <git-rebase options> <breakwater-tip>\n"
135 #: ../git-debrebase.1.pod:43
137 "Do not pass a base branch argument: git-debrebase will supply that. Do not "
138 "use --onto, or --fork-point. Useful git-rebase options include -i and --"
143 #: ../git-debrebase.1.pod:48
145 "If git-rebase stops for any reason, you may git-rebase --abort, --continue, "
146 "or --skip, as usual. If you abort the git-rebase, the branch will still "
147 "have been laundered, but everything in the rebase will be undone."
151 #: ../git-debrebase.1.pod:54
153 "The options for git-rebase must either start with C<-i>, or be prececded by "
154 "C<-->, to distinguish them from options for git-debrebase."
158 #: ../git-debrebase.1.pod:58
160 "It is hazardous to use plain git-rebase on a git-debrebase branch, because "
161 "git-rebase has a tendency to start the rebase too far back in history, and "
162 "then drop important commits. See L<git-debrebase(5)/ILLEGAL OPERATIONS>"
166 #: ../git-debrebase.1.pod:64
167 msgid "git-debrebase status"
171 #: ../git-debrebase.1.pod:66
173 "Analyses the current branch, both in terms of its contents, and the refs "
174 "which are relevant to git-debrebase, and prints a human-readable summary."
178 #: ../git-debrebase.1.pod:71
180 "Please do not attempt to parse the output; it may be reformatted or "
181 "reorganised in the future. Instead, use one of the L<UNDERLYING AND "
182 "SUPPLEMENTARY OPERATIONS> described below."
186 #: ../git-debrebase.1.pod:77
187 msgid "git-debrebase conclude"
191 #: ../git-debrebase.1.pod:79
193 "Finishes a git-debrebase session, tidying up the branch and making it fast "
198 #: ../git-debrebase.1.pod:82
200 "Specifically: if the branch is unstitched, launders and restitches it, "
201 "making a new pseudomerge. Otherwise, it is an error, unless --noop-ok."
205 #: ../git-debrebase.1.pod:88
206 msgid "git-debrebase quick"
210 #: ../git-debrebase.1.pod:90
212 "Unconditionally launders and restitches the branch, consuming any ffq-prev "
213 "and making a new pseudomerge."
217 #: ../git-debrebase.1.pod:94
218 msgid "If the branch is already laundered and stitched, does nothing."
222 #: ../git-debrebase.1.pod:96
223 msgid "git-debrebase prepush [--prose=<for commit message>]"
227 #: ../git-debrebase.1.pod:98
228 msgid "If the branch is unstitched, stitches it, consuming ffq-prev."
232 #: ../git-debrebase.1.pod:102
234 "This is a good command to run before pushing to a git server. You should "
235 "consider using B<conclude> instead, because that launders the branch too."
239 #: ../git-debrebase.1.pod:106
240 msgid "git-debrebase stitch [--prose=<for commit message>]"
244 #: ../git-debrebase.1.pod:108
245 msgid "Stitches the branch, consuming ffq-prev."
249 #: ../git-debrebase.1.pod:111
250 msgid "If there is no ffq-prev, it is an error, unless --noop-ok."
254 #: ../git-debrebase.1.pod:113
255 msgid "You should consider using B<prepush> or B<conclude> instead."
259 #: ../git-debrebase.1.pod:115
260 msgid "git-debrebase scrap"
264 #: ../git-debrebase.1.pod:117
266 "Throws away all the work since the branch was last stitched. This is done "
267 "by rewinding you to ffq-prev."
271 #: ../git-debrebase.1.pod:120
272 msgid "If you are in the middle of a git-rebase, will abort that too."
276 #: ../git-debrebase.1.pod:122
277 msgid "git-debrebase new-upstream <new-version> [<upstream-details>...]"
281 #: ../git-debrebase.1.pod:124
282 msgid "Rebases the delta queue onto a new upstream version. In detail:"
286 #: ../git-debrebase.1.pod:127
288 "Firstly, checks that the proposed rebase seems to make sense: It is a snag "
289 "unless the new upstream(s) are fast forward from the previous upstream(s) "
290 "as found in the current breakwater anchor. And, in the case of a multi-"
291 "piece upstream (a multi-component upstream, in dpkg-source terminology), if "
292 "the pieces are not in the same order, with the same names."
296 #: ../git-debrebase.1.pod:135
297 msgid "If all seems well, unstitches and launders the branch."
301 #: ../git-debrebase.1.pod:137
303 "Then, generates (in a private working area) a new anchor merge commit, on "
304 "top of the breakwater tip, and on top of that a commit to update the version "
305 "number in debian/changelog."
309 #: ../git-debrebase.1.pod:145
310 msgid "Finally, starts a git-rebase of the delta queue onto these new commits."
314 #: ../git-debrebase.1.pod:149
316 "That git-rebase may complete successfully, or it may require your "
317 "assistance, just like a normal git-rebase."
321 #: ../git-debrebase.1.pod:153
323 "If you git-rebase --abort, the whole new upstream operation is aborted, "
324 "except for the laundering."
328 #: ../git-debrebase.1.pod:157
330 "<new-version> may be a whole new Debian version, including revision, or just "
331 "the upstream part, in which case -1 will be appended to make the new Debian "
336 #: ../git-debrebase.1.pod:163
337 msgid "The <upstream-details> are, optionally, in order:"
341 #: ../git-debrebase.1.pod:167
342 msgid "<upstream-commit-ish>"
346 #: ../git-debrebase.1.pod:169
348 "The new upstream branch (or commit-ish). The default is to look for one of "
349 "these tags, in this order: U vU upstream/U; where U is the new upstream "
350 "version. (This is the same algorithm as L<git-deborig(1)>.)"
354 #: ../git-debrebase.1.pod:175
356 "It is a snag if the upstream contains a debian/ directory; if forced to "
357 "proceed, git-debrebase will disregard the upstream's debian/ and take (only) "
358 "the packaging from the current breakwater."
362 #: ../git-debrebase.1.pod:180
363 msgid "<piece-name> <piece-upstream-commit-ish>"
367 #: ../git-debrebase.1.pod:182
368 msgid "Specifies that this is a multi-piece upstream. May be repeated."
372 #: ../git-debrebase.1.pod:185
374 "When such a pair is specified, git-debrebase will first combine the pieces "
375 "of the upstream together, and then use the result as the combined new "
380 #: ../git-debrebase.1.pod:190
382 "For each <piece-name>, the tree of the <piece-upstream-commit-ish> becomes "
383 "the subdirectory <piece-name> in the combined new upstream (supplanting any "
384 "subdirectory that might be there in the main upstream branch)."
388 #: ../git-debrebase.1.pod:197
390 "<piece-name> has a restricted syntax: it may contain only ASCII "
391 "alphanumerics and hyphens."
395 #: ../git-debrebase.1.pod:200
397 "The combined upstream is itself recorded as a commit, with each of the "
398 "upstream pieces' commits as parents. The combined commit contains an "
399 "annotation to allow a future git-debrebase new upstream operation to make "
400 "the coherency checks described above."
404 #: ../git-debrebase.1.pod:206
405 msgid "<git-rebase options>"
409 #: ../git-debrebase.1.pod:208
410 msgid "These will be passed to git rebase."
414 #: ../git-debrebase.1.pod:210
416 "If the upstream rebase is troublesome, -i may be helpful. As with plain git-"
417 "debrebase, do not specify a base, or --onto, or --fork-point."
421 #: ../git-debrebase.1.pod:216
423 "If you are planning to generate a .dsc, you will also need to have, or "
424 "generate, actual orig tarball(s), which must be identical to the rev-"
425 "spec(s) passed to git-debrebase. git-debrebase does not concern itself "
426 "with source packages so neither helps with this, nor checks it. L<git-"
427 "deborig(1)>, L<git-archive(1)>, L<dgit(1)> and L<gbp-import-orig(1)> may be "
432 #: ../git-debrebase.1.pod:227
433 msgid "git-debrebase make-patches [--quiet-would-amend]"
437 #: ../git-debrebase.1.pod:229
439 "Generate patches in debian/patches/ representing the changes made to "
444 #: ../git-debrebase.1.pod:232
446 "It is not normally necessary to run this command explicitly. When uploading "
447 "to Debian, dgit and git-debrebase will cooperate to regenerate patches as "
448 "necessary. When working with pure git remotes, the patches are not needed."
452 #: ../git-debrebase.1.pod:239
454 "Normally git-debrebase make-patches will require a laundered branch. (A "
455 "laundered branch does not contain any patches.) But if there are already "
456 "some patches made by git-debrebase make-patches, and all that has happened "
457 "is that more changes to upstream files have been committed, running it again "
458 "can add the missing patches."
462 #: ../git-debrebase.1.pod:248
464 "If the patches implied by the current branch are not a simple superset of "
465 "those already in debian/patches, make-patches will fail with exit status 7, "
466 "and an error message. (The message can be suppressed with --quiet-would-"
467 "amend.) If the problem is simply that the existing patches were not made by "
468 "git-debrebase, using dgit quilt-fixup instead should succeed."
472 #: ../git-debrebase.1.pod:257
473 msgid "git-debrebase convert-from-unapplied [<upstream-commit-ish>]"
477 #: ../git-debrebase.1.pod:259
478 msgid "git-debrebase convert-from-gbp [<upstream-commit-ish>]"
482 #: ../git-debrebase.1.pod:261
483 msgid "Converts any of the following into a git-debrebase interchange branch:"
487 #: ../git-debrebase.1.pod:267
488 msgid "a gbp patches-unapplied branch (but not a gbp pq patch-queue branch)"
492 #: ../git-debrebase.1.pod:271
494 "a patches-unapplied git packaging branch containing debian/patches, as used "
499 #: ../git-debrebase.1.pod:276
501 "a git branch for a package which has no Debian delta - ie where upstream "
502 "files are have not been modified in Debian, so there are no patches"
506 #: ../git-debrebase.1.pod:282
507 msgid "(These two commands operate identically and are simply aliases.)"
511 #: ../git-debrebase.1.pod:284
513 "The conversion is done by generating a new anchor merge, converting any "
514 "quilt patches as a delta queue, and dropping the patches from the tree."
518 #: ../git-debrebase.1.pod:288
520 "The upstream commit-ish should correspond to the upstream branch or tag, if "
521 "there is one. It is a snag if it is not an ancestor of HEAD, or if the "
522 "history between the upstream and HEAD contains commits which make changes to "
523 "upstream files. If it is not specified, the same algorithm is used as for "
524 "git-debrebase new-upstream."
528 #: ../git-debrebase.1.pod:296
530 "It is also a snag if the specified upstream has a debian/ subdirectory. "
531 "This check exists to detect certain likely user errors, but if this "
532 "situation is true and expected, forcing it is fine."
536 #: ../git-debrebase.1.pod:302
538 "git-debrebase will try to look for the dgit archive view of the most recent "
539 "release, and if it finds it will make a pseduomerge so that your new git-"
540 "debrebase view is appropriately fast forward."
544 #: ../git-debrebase.1.pod:307
546 "The result is a well-formed git-debrebase interchange branch. The result is "
547 "also fast-forward from the original branch."
551 #: ../git-debrebase.1.pod:310
553 "It is a snag if the new branch looks like it will have diverged, just as for "
554 "a laundering/unstitching call to git-debrebase; See L</Establish the current "
555 "branch's ffq-prev>, below."
559 #: ../git-debrebase.1.pod:314
561 "Note that it is dangerous not to know whether you are dealing with a (gbp) "
562 "patches-unapplied branch containing quilt patches, or a git-debrebase "
563 "interchange branch. At worst, using the wrong tool for the branch format "
564 "might result in a dropped patch queue!"
568 #: ../git-debrebase.1.pod:323
569 msgid "UNDERLYING AND SUPPLEMENTARY OPERATIONS"
573 #: ../git-debrebase.1.pod:327
574 msgid "git-debrebase breakwater"
578 #: ../git-debrebase.1.pod:329
580 "Prints the breakwater tip commitid. If your HEAD branch is not fully "
581 "laundered, prints the tip of the so-far-laundered breakwater."
585 #: ../git-debrebase.1.pod:333
586 msgid "git-debrebase anchor"
590 #: ../git-debrebase.1.pod:335
591 msgid "Prints the breakwater anchor commitid."
595 #: ../git-debrebase.1.pod:337
596 msgid "git-debrebase analyse"
600 #: ../git-debrebase.1.pod:339
602 "Walks the history of the current branch, most recent commit first, back "
603 "until the most recent anchor, printing the commit object id, and commit type "
604 "and info (ie the semantics in the git-debrebase model) for each commit."
608 #: ../git-debrebase.1.pod:347
609 msgid "git-debrebase record-ffq-prev"
613 #: ../git-debrebase.1.pod:349
615 "Establishes the current branch's ffq-prev, as discussed in L</UNSTITCHING "
616 "AND LAUNDERING>, but does not launder the branch or move HEAD."
620 #: ../git-debrebase.1.pod:353
622 "It is an error if the ffq-prev could not be recorded. It is also an error "
623 "if an ffq-prev has already been recorded, unless --noop-ok."
627 #: ../git-debrebase.1.pod:357
628 msgid "git-debrebase launder-v0"
632 #: ../git-debrebase.1.pod:359
634 "Launders the branch without recording anything in ffq-prev. Then prints "
635 "some information about the current branch. Do not use this operation; it "
636 "will be withdrawn soon."
640 #: ../git-debrebase.1.pod:364
641 msgid "git-debrebase convert-to-gbp"
645 #: ../git-debrebase.1.pod:366
647 "Converts a laundered branch into a gbp patches-unapplied branch containing "
648 "quilt patches. The result is not fast forward from the interchange branch, "
649 "and any ffq-prev is deleted."
653 #: ../git-debrebase.1.pod:371
655 "This is provided mostly for the test suite and for unusual situations. It "
656 "should only be used with care and with a proper understanding of the "
661 #: ../git-debrebase.1.pod:376
663 "Be sure to not accidentally treat the result as a git-debrebase branch, or "
664 "you will drop all the patches!"
668 #: ../git-debrebase.1.pod:380
669 msgid "git-debrebase convert-from-dgit-view [<convert-options>] [upstream]"
673 #: ../git-debrebase.1.pod:382
675 "Converts any dgit-compatible git branch corresponding to a (possibly "
676 "hypothetical) 3.0 quilt dsc source package into a git-debrebase-compatible "
681 #: ../git-debrebase.1.pod:386
683 "This operation should not be used if the branch is already in git-debrebase "
684 "form. Normally git-debrebase will refuse to continue in this case (or "
685 "silently do nothing if the global --noop-ok option is used)."
689 #: ../git-debrebase.1.pod:391
691 "Some representation of the original upstream source code will be needed. If "
692 "I<upstream> is supplied, that must be a suitable upstream commit. By "
693 "default, git-debrebase will look first for git tags (as for new-upstream), "
694 "and then for orig tarballs which it will ask dgit to process."
698 #: ../git-debrebase.1.pod:397
700 "The upstream source must be exactly right and all the patches in debian/"
701 "patches must be up to date. Applying the patches from debian/patches to the "
702 "upstream source must result in exactly your HEAD."
706 #: ../git-debrebase.1.pod:402
708 "The output is laundered and stitched. The resulting history is not "
709 "particularly pretty, especially if orig tarball(s) were imported to produce "
710 "a synthetic upstream commit."
714 #: ../git-debrebase.1.pod:407
716 "The available convert-options are as follows. (These must come after "
717 "convert-from-dgit-view.)"
721 #: ../git-debrebase.1.pod:412
722 msgid "--[no-]diagnose"
726 #: ../git-debrebase.1.pod:414
728 "Print additional error messages to help diagnose failure to find an "
729 "appropriate upstream. --no-diagnose is the default."
733 #: ../git-debrebase.1.pod:418
734 msgid "--build-products-dir"
738 #: ../git-debrebase.1.pod:420
740 "Directory to look in for orig tarballs. The default is the git config "
741 "option dgit.default.build-products-dir or failing that, C<..>. Passed on to "
742 "dgit, if git-debrebase invokes dgit."
746 #: ../git-debrebase.1.pod:426
751 #: ../git-debrebase.1.pod:428
753 "Whether to try to look for or use any orig tarballs. --origs is the default."
757 #: ../git-debrebase.1.pod:431
762 #: ../git-debrebase.1.pod:433
764 "Whether to try to look for or use any upstream git tags. --tags is the "
769 #: ../git-debrebase.1.pod:436
770 msgid "--always-convert-anyway"
774 #: ../git-debrebase.1.pod:438
776 "Perform the conversion operation, producing unpleasant extra history, even "
777 "if the branch seems to be in git-debrebase form already. This should not be "
778 "done unless necessary, and it should not be necessary."
782 #: ../git-debrebase.1.pod:446
783 msgid "git-debrebase forget-was-ever-debrebase"
787 #: ../git-debrebase.1.pod:448
789 "Deletes the ffq-prev and debrebase-last refs associated with this branch, "
790 "that git-debrebase and dgit use to determine whether this branch is managed "
791 "by git-debrebase, and what previous head may need to be stitched back in."
795 #: ../git-debrebase.1.pod:454
797 "This can be useful if you were just playing with git-debrebase, and have "
798 "used git-reset --hard to go back to a commit before your experiments."
802 #: ../git-debrebase.1.pod:458
803 msgid "Do not use this if you expect to run git-debrebase on the branch again."
807 #: ../git-debrebase.1.pod:464
809 "This section documents the general options to git-debrebase (ie, the ones "
810 "which immediately follow git-debrebase or git debrebase on the command "
811 "line). Individual operations may have their own options which are docuented "
812 "under each operation."
816 #: ../git-debrebase.1.pod:476
821 #: ../git-debrebase.1.pod:478
822 msgid "Turns snag(s) with id <snag-id> into warnings."
826 #: ../git-debrebase.1.pod:480
828 "Some troublesome things which git-debrebase encounters are B<snag>s. (The "
829 "specific instances are discussed in the text for the relevant operation.)"
833 #: ../git-debrebase.1.pod:485
835 "When a snag is detected, a message is printed to stderr containing the snag "
836 "id (in the form C<-f<snag-idE<gt>>), along with some prose."
840 #: ../git-debrebase.1.pod:490
842 "If snags are detected, git-debrebase does not continue, unless the relevant -"
843 "f<snag-id> is specified, or --force is specified."
847 #: ../git-debrebase.1.pod:494
852 #: ../git-debrebase.1.pod:496
853 msgid "Turns all snags into warnings. See the -f<snag-id> option."
857 #: ../git-debrebase.1.pod:499
859 "Do not invoke git-debrebase --force in scripts and aliases; instead, specify "
860 "the particular -f<snag-id> for expected snags."
864 #: ../git-debrebase.1.pod:502
869 #: ../git-debrebase.1.pod:504
871 "Suppresses the error in some situations where git-debrebase does nothing, "
872 "because there is nothing to do."
876 #: ../git-debrebase.1.pod:508
878 "The specific instances are discussed in the text for the relvant operation."
882 #: ../git-debrebase.1.pod:511
883 msgid "--anchor=<commit-ish>"
887 #: ../git-debrebase.1.pod:513
889 "Treats <commit-ish> as an anchor. This overrides the usual logic which "
890 "automatically classifies commits as anchors, pseudomerges, delta queue "
895 #: ../git-debrebase.1.pod:517
897 "It also disables some coherency checks which depend on metadata extracted "
898 "from its commit message, so it is a snag if <commit-ish> is the anchor for "
899 "the previous upstream version in git-debrebase new-upstream operations."
903 #: ../git-debrebase.1.pod:524
904 msgid "--dgit=<program>"
908 #: ../git-debrebase.1.pod:526
910 "Run <program>, instead of dgit from PATH, when invocation of dgit is "
911 "necessary. This is provided mostly for the benefit of the test suite."
915 #: ../git-debrebase.1.pod:530
920 #: ../git-debrebase.1.pod:532
921 msgid "Requests (more) debugging. May be repeated."
925 #: ../git-debrebase.1.pod:534
926 msgid "--experimental-merge-resolution"
930 #: ../git-debrebase.1.pod:536
932 "Enable experimental code for handling general merges (see L<git-debrebase(5)/"
937 #: ../git-debrebase.1.pod:539
939 "This option may generate lossage of various kinds, including misleading "
940 "error messages, references to nonexistent documentation, and you being "
941 "handed an incomprehensible pile of multidimensional merge wreckage."
945 #: ../git-debrebase.1.pod:547
946 msgid "UNSTITCHING AND LAUNDERING"
950 #: ../git-debrebase.1.pod:549
952 "Several operations unstitch and launder the branch first. In detail this "
957 #: ../git-debrebase.1.pod:552
958 msgid "Establish the current branch's ffq-prev"
962 #: ../git-debrebase.1.pod:554
964 "If ffq-prev is not yet recorded, git-debrebase checks that the current "
965 "branch is ahead of relevant remote tracking branches. The relevant branches "
966 "depend on the current branch (and its git configuration) and are as follows:"
970 #: ../git-debrebase.1.pod:566
972 "The branch that git would merge from (remote.<branch>.merge, remote.<branch>."
977 #: ../git-debrebase.1.pod:571
979 "The branch git would push to, if different (remote.<branch>.pushRemote etc.);"
983 #: ../git-debrebase.1.pod:576
984 msgid "For local dgit suite branches, the corresponding tracking remote;"
988 #: ../git-debrebase.1.pod:581
989 msgid "If you are on C<master>, remotes/dgit/dgit/sid."
993 #: ../git-debrebase.1.pod:586
995 "The apparently relevant ref names to check are filtered through branch."
996 "<branch>.ffq-ffrefs, which is a semicolon-separated list of glob patterns, "
997 "each optionally preceded by !; first match wins."
1001 #: ../git-debrebase.1.pod:591
1003 "In each case it is a snag if the local HEAD is behind the checked remote, or "
1004 "if local HEAD has diverged from it. All the checks are done locally using "
1005 "the remote tracking refs: git-debrebase does not fetch anything from "
1010 #: ../git-debrebase.1.pod:597
1012 "If these checks pass, or are forced, git-debrebse then records the current "
1017 #: ../git-debrebase.1.pod:601
1018 msgid "Examine the branch"
1022 #: ../git-debrebase.1.pod:603
1024 "git-debrebase analyses the current HEAD's history to find the anchor in its "
1025 "breakwater, and the most recent breakwater tip."
1029 #: ../git-debrebase.1.pod:608
1030 msgid "Rewrite the commits into laundered form"
1034 #: ../git-debrebase.1.pod:610
1036 "Mixed debian+upstream commits are split into two commits each. Delta queue "
1037 "(upstream files) commits bubble to the top. Pseudomerges, and quilt patch "
1038 "additions, are dropped."
1042 #: ../git-debrebase.1.pod:616
1044 "This rewrite will always succeed, by construction. The result is the "
1049 #: ../git-debrebase.1.pod:621
1050 msgid "git-debrebase(1), dgit-maint-debrebase(7), dgit(1), gitglossary(7)"