diff options
author | Sean Whitton <spwhitton@spwhitton.name> | 2019-06-23 16:39:18 +0100 |
---|---|---|
committer | Sean Whitton <spwhitton@spwhitton.name> | 2019-06-23 16:39:18 +0100 |
commit | fa917e493d6d4d30b0b824cc7ed4c02f5067eaab (patch) | |
tree | bdc1b4f0d969a294eb47e18bebc1777e7e65bbd9 /git-debrebase.5.pod | |
parent | 5eb8e042adf67fc5a7a25a1694b4df1dd50b44de (diff) | |
parent | 0594f61c6ea940a4d88bffb5384f775d5a7be194 (diff) |
Merge tag 'debian/8.5' into stretch-bpo
dgit release 8.5 for unstable (sid) [dgit]
[dgit distro=debian]
# gpg: Signature made Mon 27 May 2019 12:24:02 AM BST
# gpg: using RSA key 559AE46C2D6B6D3265E7CBA1E3E3392348B50D39
# gpg: Good signature from "Ian Jackson (new general purpose key) <ijackson@chiark.greenend.org.uk>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 559A E46C 2D6B 6D32 65E7 CBA1 E3E3 3923 48B5 0D39
Diffstat (limited to 'git-debrebase.5.pod')
-rw-r--r-- | git-debrebase.5.pod | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/git-debrebase.5.pod b/git-debrebase.5.pod index 439fd63..d23c6b2 100644 --- a/git-debrebase.5.pod +++ b/git-debrebase.5.pod @@ -146,7 +146,7 @@ See L</STITCHING, PSEUDO-MERGES, FFQ RECORD>. git-debrebase has one primary branch, the B<interchange branch>. -This branch is found on Debian contributor's workstations +This branch is found on Debian contributors' workstations (typically, a maintainer would call it B<master>), in the Debian dgit git server as the suite branch (B<dgit/dgit/sid>) and on other git servers which support Debian work @@ -175,7 +175,7 @@ the upstream commits). The breakwater does not contain any representation of the delta queue (not even debian/patches). The part of the breakwater processed by git-debrebase -is the part since the most reecent B<anchor>, +is the part since the most recent B<anchor>, which is usually a special merge generated by git-debrebase. When working, locally, @@ -255,7 +255,7 @@ a representation of the delta queue: =item Delta queue commits Zero or more single-parent commits -contaioning only changes to upstream files. +containing only changes to upstream files. =back @@ -266,7 +266,7 @@ branch state is also B<rebasing>. It has the same contents as the laundered state, except that it may contain, additionally, -in B<in any order but after the breakwater>: +B<in any order but after the breakwater>: =over @@ -379,8 +379,8 @@ When ffq-prev is not present, C<refs/debrebase-last/B> records some ancestor of refs/B, (usually, the result of last stitch). This is used for status printing and some error error checks - -especially for printing guesses what a problem is. -To determine whether a branch is +especially for printing guesses about what a problem is. +To determine whether a branch is being maintained in git-debrebase form it is necessary to walk its history. @@ -419,7 +419,7 @@ so we can at least detect unsupported merges. =head1 LEGAL OPERATIONS -The following basic operations follows from this model +The following basic operations follow from this model (refer to the diagram above): =over @@ -472,7 +472,7 @@ so that git log shows the packaging history.) =item Stitch Make a pseudomerge, -whose contributing parent to is the unstitched branch +whose contributing parent is the unstitched branch and whose overwritten parent is ffq-prev, consuming ffq-prev in the process @@ -483,7 +483,7 @@ or perhaps a laundered branch with a quilt patch addition commit. =item Commit quilt patches To generate a tree which can be represented as a -3.0 (quilt) .dsc source packages, +3.0 (quilt) .dsc source package, the delta queue must be reified inside the git tree in B<debian/patches/>. These patch files can be stripped out and/or regenerated as needed. @@ -515,7 +515,7 @@ For these reasons, it is better to use git-debrebase and let it choose the base for your rebase. -If you do realise you have make this mistake, +If you do realise you have made this mistake, it is best to use the reflog to recover to a suitable good previous state. |