From 190c045107f1681dd7f5232bd3ad41088e0a8244 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 14 Apr 2018 13:58:42 +0100 Subject: git-debrebase(5): Move TERMINOLOGY earlier As suggested by Sean. Signed-off-by: Ian Jackson --- git-debrebase.5.pod | 104 ++++++++++++++++++++++++++-------------------------- 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/git-debrebase.5.pod b/git-debrebase.5.pod index b9abba0..f749f62 100644 --- a/git-debrebase.5.pod +++ b/git-debrebase.5.pod @@ -27,6 +27,58 @@ provided by your upstream. However, of git-debrebase in Debian does not make anything harder for derivatives, and it can make some things easier. +=head1 TERMINOLOGY + +=over + +=item Pseudomerge + +A merge which does not actually merge the trees; +instead, it takes its tree, by construction, from only one parent. +These are used to make a rewritten history fast forward +from a previous tip, +so that it can be pushed and pulled normally. +Manual construction of pseudomerges can be done with +C +but is not normally needed when using git-debrebase. + +=item Packaging files + +Files in the source tree within B, +excluding anything in B. + +=item Upstream + +The version of the package without Debian's packaging. +Typically provided by the actual upstream project, +and sometimes tracked by Debian contributors in a branch C. + +Upstream contains upstream files, +but some upstreams also contain packaging files in B. +Any such non-upstream files found in upstream +are thrown away by git-debrebase +each time a new upstream version is incorporated. + +=item Upstream files + +Files in the source tree outside B. +These may include unmodified source from upstream, +but also files which have been modified or created for Debian. + +=item Delta queue + +Debian's changes to upstream files: +a series of git commits. + +=item Quilt patches + +Files in B generated for the benefit of +dpkg-source's 3.0 (quilt) .dsc source package format. +Not used, often deleted, and regenerated when needed, +by git-debrebase. + +=back + =head1 DIAGRAM ------/--A!----/--B3!--%--/--> interchange view @@ -432,58 +484,6 @@ The C and C tags are added to the pre-existing commit message, when git-debrebase rewrites the commit. -=head1 TERMINOLOGY - -=over - -=item Pseudomerge - -A merge which does not actually merge the trees; -instead, it takes its tree, by construction, from only one parent. -These are used to make a rewritten history fast forward -from a previous tip, -so that it can be pushed and pulled normally. -Manual construction of pseudomerges can be done with -C -but is not normally needed when using git-debrebase. - -=item Packaging files - -Files in the source tree within B, -excluding anything in B. - -=item Upstream - -The version of the package without Debian's packaging. -Typically provided by the actual upstream project, -and sometimes tracked by Debian contributors in a branch C. - -Upstream contains upstream files, -but some upstreams also contain packaging files in B. -Any such non-upstream files found in upstream -are thrown away by git-debrebase -each time a new upstream version is incorporated. - -=item Upstream files - -Files in the source tree outside B. -These may include unmodified source from upstream, -but also files which have been modified or created for Debian. - -=item Delta queue - -Debian's changes to upstream files: -a series of git commits. - -=item Quilt patches - -Files in B generated for the benefit of -dpkg-source's 3.0 (quilt) .dsc source package format. -Not used, often deleted, and regenerated when needed, -by git-debrebase. - -=back - =head1 APPENDIX - DGIT IMPORT HANDLING Consider a non-dgit NMU followed by a dgit NMU: -- cgit v1.2.3