X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit-maint-merge.7.pod;h=df1f953cdeb8956cd9e3aecf789a892b454cfac7;hb=3e0e30a2fab1b5770c770bbc4df3d55bef611d20;hp=16fef9b977c797dd301e5fdce3fdf2c705cf199f;hpb=eaacd8a861ecf3dde313800f758fc1dd8a595aff;p=dgit.git diff --git a/dgit-maint-merge.7.pod b/dgit-maint-merge.7.pod index 16fef9b9..df1f953c 100644 --- a/dgit-maint-merge.7.pod +++ b/dgit-maint-merge.7.pod @@ -205,9 +205,14 @@ Then make new upstream tags available: =back +=for dgit-test dpkg-source-ignores begin + Now you simply need to ensure that your git HEAD is dgit-compatible, -i.e., it is exactly what you would get if you ran B and then unpacked the resultant source package. +i.e., it is exactly what you would get if you ran +B +and then unpacked the resultant source package. + +=for dgit-test dpkg-source-ignores end To achieve this, you might need to delete I. One way to have dgit check your @@ -258,8 +263,8 @@ first upload of upstream version 1.2.3, you could use: =back -(If you have dgit, use dgit clone foo, -rather than plain git clone.) +(If you have dgit, use `dgit clone foo`, +rather than plain `git clone`.) A single combined diff, containing all the changes, follows.