aboutsummaryrefslogtreecommitdiff
path: root/docs/chapters/special.sgml
diff options
context:
space:
mode:
authorGuido Guenther <agx@sigxcpu.org>2008-02-29 18:03:45 +0100
committerGuido Guenther <agx@sigxcpu.org>2008-02-29 18:03:45 +0100
commitca89f63aa935e0336c5dfbb6b2d8943767d45c0c (patch)
tree88373a89bf008e261825184f61ead9361a2aa818 /docs/chapters/special.sgml
parent913d8c793ded8ebe2294ea260cf6fdf2822a318f (diff)
update documentation about git-import-dsc and --filter
Diffstat (limited to 'docs/chapters/special.sgml')
-rw-r--r--docs/chapters/special.sgml14
1 files changed, 6 insertions, 8 deletions
diff --git a/docs/chapters/special.sgml b/docs/chapters/special.sgml
index 951e378..02d9e05 100644
--- a/docs/chapters/special.sgml
+++ b/docs/chapters/special.sgml
@@ -48,19 +48,17 @@ cleanup-script.sh
&gitcmd; <option>branch</option> <replaceable>nmu</replaceable> <replaceable>master</replaceable>
</screen>
<para>
- To import an NMU instead of a new upstream version simply import the
- unpacked NMUs source tree into your repository using &git-import-orig:
+ To import an NMU change into the git repository and use &git-import-dsc;:
</para>
<screen>
&gitcmd; checkout <replaceable>master</replaceable>
-&git-import-orig; <option>-u</option> <replaceable>10-1.1</replaceable> <option>--upstream-branch</option>=<replaceable>nmu</replaceable> <filename>/path/to/nmu-10/</filename>
+&git-import-dsc; <option>--debian-branch</option>=<replaceable>nmu</replaceable> <filename>/path/to/package_1.0-1nmu0.dsc</filename>
</screen>
<para>
- This will import the NMU onto the branched named <emphasis>nmu</emphasis> branch instead of
- the default <option>upstream-branch</option> and merge the changes to the
- <option>debian-branch</option> as usual. This method can also be used to
- import "old" releases into the &git; repository when migrating to &git; from
- another VCS.
+ This will import the NMU onto the branched named <emphasis>nmu</emphasis>
+ instead of the default <option>master</option>. This method can also
+ be used to import "old" releases into the &git; repository when migrating
+ to &git; from another VCS.
</para>
</sect1>