X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit.7;h=635dc132e8ab67d7c30b154127fae82093309e93;hp=6ad6ecb8e0ff1ba944aa68ba0c8d69f8db529ca7;hb=6516b26b1e24241f879b9bde6533d1c8a384c803;hpb=55efcfb95f9453c6a83f824988a523a26f688ee8

diff --git a/dgit.7 b/dgit.7
index 6ad6ecb8..635dc132 100644
--- a/dgit.7
+++ b/dgit.7
@@ -282,6 +282,17 @@ branches, it will fail.
 As the maintainer you therefore have the following options:
 .TP
 \(bu
+Delete the files from your git branches,
+and your Debian source packages,
+and carry the deletion as a delta from upstream.
+(With `3.0 (quilt)' this means represeting the deletions as patches.
+You may need to pass --include-removal to dpkg-source --commit,
+or pass corresponding options to other tools.)
+This can make the Debian
+source package less useful for people without Debian build
+infrastructure.
+.TP
+\(bu
 Persuade upstream that the source code in their git history and the
 source they ship as tarballs should be identical.  Of course simply
 removing the files from the tarball may make the tarball hard for
@@ -292,17 +303,6 @@ files, perhaps with some simple automation to deal with conflicts and
 spurious changes.  This has the advantage that someone who clones
 the git repository finds the program just as easy to build as someone
 who uses the tarball.
-.TP
-\(bu
-Delete the files from your git branches,
-and your Debian source packages,
-and carry the deletion as a delta from upstream.
-(With `3.0 (quilt)' this means represeting the deletions as patches.
-You may need to pass --include-removal to dpkg-source --commit,
-or pass corresponding options to other tools.)
-This can make the Debian
-source package less useful for people without Debian build
-infrastructure.
 .LP
 Of course it may also be that the differences are due to build system
 bugs, which cause unintended files to end up in the source package.