diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-04-14 13:58:42 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-06-16 16:07:00 +0100 |
commit | 190c045107f1681dd7f5232bd3ad41088e0a8244 (patch) | |
tree | 0e86852de661dea8e26ce300beafd0c1969d7bc1 /git-debrebase.5.pod | |
parent | 1c282fc517987649f824fb8241e805c3d3fe68c4 (diff) |
git-debrebase(5): Move TERMINOLOGY earlier
As suggested by Sean.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'git-debrebase.5.pod')
-rw-r--r-- | git-debrebase.5.pod | 104 |
1 files 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<git merge -s ours> +but is not normally needed when using git-debrebase. + +=item Packaging files + +Files in the source tree within B<debian/>, +excluding anything in B<debian/patches/>. + +=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>. + +Upstream contains upstream files, +but some upstreams also contain packaging files in B<debian/>. +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<debian/>. +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<debian/patches/> 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<split mixed commit> and C<convert dgit import> 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<git merge -s ours> -but is not normally needed when using git-debrebase. - -=item Packaging files - -Files in the source tree within B<debian/>, -excluding anything in B<debian/patches/>. - -=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>. - -Upstream contains upstream files, -but some upstreams also contain packaging files in B<debian/>. -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<debian/>. -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<debian/patches/> 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: |