diff options
Diffstat (limited to 'po4a/git-debrebase_1.pot')
| -rw-r--r-- | po4a/git-debrebase_1.pot | 77 |
1 files changed, 41 insertions, 36 deletions
diff --git a/po4a/git-debrebase_1.pot b/po4a/git-debrebase_1.pot index 46aa9f4..74b61a8 100644 --- a/po4a/git-debrebase_1.pot +++ b/po4a/git-debrebase_1.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2020-02-02 16:50+0000\n" +"POT-Creation-Date: 2022-12-29 00: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" @@ -28,18 +28,18 @@ msgid "NAME" msgstr "" #. type: =head1 -#: ../dgit.1:496 ../git-debrebase.1.pod:477 +#: ../dgit.1:548 ../git-debrebase.1.pod:477 #, no-wrap msgid "OPTIONS" msgstr "" #. type: =head1 -#: ../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: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 +#: ../dgit.1:1676 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:125 +#: ../dgit-maint-merge.7.pod:547 ../dgit-maint-gbp.7.pod:139 +#: ../dgit-maint-debrebase.7.pod:792 ../dgit-downstream-dsc.7.pod:352 +#: ../dgit-sponsorship.7.pod:322 ../dgit-maint-bpo.7.pod:140 +#: ../git-debrebase.1.pod:637 ../git-debrebase.5.pod:678 #: ../git-debpush.1.pod:261 #, no-wrap msgid "SEE ALSO" @@ -82,7 +82,7 @@ msgid "" " git debrebase -i # edit the patch queue\n" " git debrebase conclude && git push # push to eg salsa\n" " git debrebase conclude && dgit push-source # source-only upload\n" -" git debrebase [-i] new-upstream 1.2.3-1 # uses tag, eg \"v1.2.3\"\n" +" git debrebase new-upstream 1.2.3-1 [-i] # uses tag, eg \"v1.2.3\"\n" " dpkg-buildpackage -uc -b # get test debs, at any time\n" "\n" msgstr "" @@ -303,7 +303,9 @@ msgstr "" #. type: =item #: ../git-debrebase.1.pod:137 -msgid "git-debrebase new-upstream <new-version> [<upstream-details>...]" +msgid "" +"git-debrebase new-upstream <new-version> [<upstream-details>...] [--|-i <git-" +"rebase options...>]" msgstr "" #. type: textblock @@ -924,46 +926,49 @@ msgstr "" #: ../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 " -"the previous upstream version in git-debrebase new-upstream operations." +"from its commit message, so it is a snag (C<-fanchor-treated>) if <commit-" +"ish> is the anchor for the previous upstream version in git-debrebase new-" +"upstream operations. You have to check yourself that the new upstream is " +"fast forward from the old one, and has the right components (as if " +"applicable)." msgstr "" #. type: =item -#: ../git-debrebase.1.pod:539 +#: ../git-debrebase.1.pod:542 msgid "--dgit=<program>" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:541 +#: ../git-debrebase.1.pod:544 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:545 +#: ../git-debrebase.1.pod:548 msgid "-D" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:547 +#: ../git-debrebase.1.pod:550 msgid "Requests (more) debugging. May be repeated." msgstr "" #. type: =item -#: ../git-debrebase.1.pod:549 +#: ../git-debrebase.1.pod:552 msgid "--experimental-merge-resolution" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:551 +#: ../git-debrebase.1.pod:554 msgid "" "Enable experimental code for handling general merges (see L<git-debrebase(5)/" "General merges>)." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:554 +#: ../git-debrebase.1.pod:557 msgid "" "This option may generate lossage of various kinds, including misleading " "error messages, references to nonexistent documentation, and you being " @@ -971,24 +976,24 @@ msgid "" msgstr "" #. type: =head1 -#: ../git-debrebase.1.pod:562 +#: ../git-debrebase.1.pod:565 msgid "UNSTITCHING AND LAUNDERING" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:564 +#: ../git-debrebase.1.pod:567 msgid "" "Several operations unstitch and launder the branch first. In detail this " "means:" msgstr "" #. type: =head2 -#: ../git-debrebase.1.pod:567 +#: ../git-debrebase.1.pod:570 msgid "Establish the current branch's ffq-prev" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:569 +#: ../git-debrebase.1.pod:572 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 " @@ -996,30 +1001,30 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:581 +#: ../git-debrebase.1.pod:584 msgid "" "The branch that git would merge from (remote.<branch>.merge, remote.<branch>." "remote);" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:586 +#: ../git-debrebase.1.pod:589 msgid "" "The branch git would push to, if different (remote.<branch>.pushRemote etc.);" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:591 +#: ../git-debrebase.1.pod:594 msgid "For local dgit suite branches, the corresponding tracking remote;" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:596 +#: ../git-debrebase.1.pod:599 msgid "If you are on C<master>, remotes/dgit/dgit/sid." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:601 +#: ../git-debrebase.1.pod:604 msgid "" "The apparently relevant ref names to check are filtered through branch." "<branch>.ffq-ffrefs, which is a semicolon-separated list of glob patterns, " @@ -1027,7 +1032,7 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:606 +#: ../git-debrebase.1.pod:609 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 " @@ -1036,31 +1041,31 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:612 +#: ../git-debrebase.1.pod:615 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:616 +#: ../git-debrebase.1.pod:619 msgid "Examine the branch" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:618 +#: ../git-debrebase.1.pod:621 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:623 +#: ../git-debrebase.1.pod:626 msgid "Rewrite the commits into laundered form" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:625 +#: ../git-debrebase.1.pod:628 msgid "" "Mixed debian+upstream commits are split into two commits each. Delta queue " "(upstream files) commits bubble to the top. Pseudomerges, and quilt patch " @@ -1068,13 +1073,13 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:631 +#: ../git-debrebase.1.pod:634 msgid "" "This rewrite will always succeed, by construction. The result is the " "laundered branch." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:636 +#: ../git-debrebase.1.pod:639 msgid "git-debrebase(1), dgit-maint-debrebase(7), dgit(1), gitglossary(7)" msgstr "" |