From: Ian Jackson Date: Wed, 11 Apr 2018 23:29:50 +0000 (+0100) Subject: git-debrebase(5): Rework the description a bit X-Git-Tag: archive/debian/5.0~91 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=78207a7720cb29b1640232afd81bed0fa313f7f6;p=dgit.git git-debrebase(5): Rework the description a bit Mention whether branches and branch states are ff. And describe the breakwater. Signed-off-by: Ian Jackson --- diff --git a/git-debrebase.5.pod b/git-debrebase.5.pod index dce648e8..f181a40e 100644 --- a/git-debrebase.5.pod +++ b/git-debrebase.5.pod @@ -116,11 +116,13 @@ state, which means it has a more particular special form convenient for manipulating the delta queue. -=head1 BRANCH CONTENTS +=head1 BRANCH CONTENTS - DETAILED SPECIFICATION It is most convenient to describe the -B -state first. +B +branch first. +A breakwater is B, +but is not usually named by a ref. It contains B (ancestors first): =over @@ -151,6 +153,18 @@ Zero or more single-parent commits containing only packaging changes. (And no quilt patch changes.) +=back + +The +B +branch state is B. +A laundered branch is based on a breakwater +but also contains, additionally, +B the breakwater, +a representation of the delta queue: + +=over + =item Delta queue commits Zero or more single-parent commits @@ -158,13 +172,14 @@ contaioning only changes to upstream files. =back -The +An B (unlaundered) -branch state is the same, +branch state is also B. +It has the same contents as the laundered state, except that it may contain, additionally, -in B: +in B: =over @@ -188,9 +203,12 @@ they are deleted when branches are laundered. =back -The +Finally, an B -branch state is the same, but may additionally contain +branch is B. +It has the same contents as an +unlaundered branch state, +but may (and usually will) additionally contain (in some order, possibly intermixed with the extra commits which may be found on an unstitched unlaundered branch):