diff options
Diffstat (limited to 'po4a/git-debrebase_1.pot')
| -rw-r--r-- | po4a/git-debrebase_1.pot | 58 |
1 files changed, 36 insertions, 22 deletions
diff --git a/po4a/git-debrebase_1.pot b/po4a/git-debrebase_1.pot index 74b61a8..5b9c051 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: 2022-12-29 00:50+0000\n" +"POT-Creation-Date: 2022-12-29 11:56+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" @@ -39,7 +39,7 @@ msgstr "" #: ../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-debrebase.1.pod:647 ../git-debrebase.5.pod:678 #: ../git-debpush.1.pod:261 #, no-wrap msgid "SEE ALSO" @@ -970,30 +970,44 @@ msgstr "" #. type: textblock #: ../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 " -"handed an incomprehensible pile of multidimensional merge wreckage." +"If using this option succeeds, the output is likely to be correct, although " +"it would be a good idea to check that it seems sane." +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:561 +msgid "If it fails, your tree should be left where it was." +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:563 +msgid "" +"However, there may be lossage of various kinds, including misleading error " +"messages, and references to nonexistent documentation. On merge failure, it " +"might invite you to delve into an incomprehensible pile of multidimensional " +"merge wreckage, which is supposed to be left in special refs invented for " +"the purpose (so, not your working tree, or HEAD)." msgstr "" #. type: =head1 -#: ../git-debrebase.1.pod:565 +#: ../git-debrebase.1.pod:575 msgid "UNSTITCHING AND LAUNDERING" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:567 +#: ../git-debrebase.1.pod:577 msgid "" "Several operations unstitch and launder the branch first. In detail this " "means:" msgstr "" #. type: =head2 -#: ../git-debrebase.1.pod:570 +#: ../git-debrebase.1.pod:580 msgid "Establish the current branch's ffq-prev" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:572 +#: ../git-debrebase.1.pod:582 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 " @@ -1001,30 +1015,30 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:584 +#: ../git-debrebase.1.pod:594 msgid "" "The branch that git would merge from (remote.<branch>.merge, remote.<branch>." "remote);" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:589 +#: ../git-debrebase.1.pod:599 msgid "" "The branch git would push to, if different (remote.<branch>.pushRemote etc.);" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:594 +#: ../git-debrebase.1.pod:604 msgid "For local dgit suite branches, the corresponding tracking remote;" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:599 +#: ../git-debrebase.1.pod:609 msgid "If you are on C<master>, remotes/dgit/dgit/sid." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:604 +#: ../git-debrebase.1.pod:614 msgid "" "The apparently relevant ref names to check are filtered through branch." "<branch>.ffq-ffrefs, which is a semicolon-separated list of glob patterns, " @@ -1032,7 +1046,7 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:609 +#: ../git-debrebase.1.pod:619 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 " @@ -1041,31 +1055,31 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:615 +#: ../git-debrebase.1.pod:625 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:619 +#: ../git-debrebase.1.pod:629 msgid "Examine the branch" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:621 +#: ../git-debrebase.1.pod:631 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:626 +#: ../git-debrebase.1.pod:636 msgid "Rewrite the commits into laundered form" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:628 +#: ../git-debrebase.1.pod:638 msgid "" "Mixed debian+upstream commits are split into two commits each. Delta queue " "(upstream files) commits bubble to the top. Pseudomerges, and quilt patch " @@ -1073,13 +1087,13 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:634 +#: ../git-debrebase.1.pod:644 msgid "" "This rewrite will always succeed, by construction. The result is the " "laundered branch." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:639 +#: ../git-debrebase.1.pod:649 msgid "git-debrebase(1), dgit-maint-debrebase(7), dgit(1), gitglossary(7)" msgstr "" |