diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-03-25 12:33:28 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-16 16:07:00 +0100 |
| commit | 58cd6d7cf9c2e0c5faba010744079881da008fea (patch) | |
| tree | c4cda16dbae294cc0aa00a58b41ac1ec1510ceb5 /git-debrebase.5.pod | |
| parent | 81c93c4ce3cc0a70ee48f3f8c2081f07a481a526 (diff) | |
git-debrebase: maintain debrebase-last
This is mostly for the benefit of dgit(1), which wants to know whether
to run gdr to do quilt fixup.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase.5.pod')
| -rw-r--r-- | git-debrebase.5.pod | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/git-debrebase.5.pod b/git-debrebase.5.pod index fb9cff2..dce648e 100644 --- a/git-debrebase.5.pod +++ b/git-debrebase.5.pod @@ -257,6 +257,12 @@ the interchange and breakwater branches may be identical, in which case the unstitched branch is fast forward from the interchange branch and no pseudomerge is needed. +When ffq-prev is not present, +C<refs/debrebase-last/B> records some ancestor of refs/B, +(usually, the result of last stitch). +This can be used to quickly determine whether refs/B +is being maintained in git-debrebase form. + =head1 OTHER MERGES Note that the representation described here does not permit @@ -304,7 +310,8 @@ or both. =item Launder branch Record the previous tip in ffq-prev, -if we were stitched before. +if we were stitched before +(and delete debrebase-last). Reorganise the current branch so that the packaging changes come first, @@ -340,7 +347,8 @@ Make a pseudomerge, whose contributing parent to is the unstitched branch and whose overwritten parent is ffq-prev, -consuming ffq-prev in the process. +consuming ffq-prev in the process +(and writing debrebase-last instead). Ideally the contributing parent would be a laundered branch, or perhaps a laundered branch with a quilt patch addition commit. |