aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/chapters/import.sgml12
-rw-r--r--docs/chapters/special.sgml14
2 files changed, 18 insertions, 8 deletions
diff --git a/docs/chapters/import.sgml b/docs/chapters/import.sgml
index 7ff450c..9a54ae3 100644
--- a/docs/chapters/import.sgml
+++ b/docs/chapters/import.sgml
@@ -16,6 +16,16 @@
options or via the <option>upstream-branch</option> and
<option>debian-branch</option> options in the configuration file.
</para>
+ <para>
+ If you want to import further versions you can change into your shiny new
+ &git; repository and just continue with the same command:
+ <screen>
+cd package/
+&git-import-dsc; package_0.1-2.dsc
+&git-import-dsc; package_0.1-3.dsc
+&git-import-dsc; package_0.2-1.dsc
+ </screen>
+ </para>
</sect1>
<sect1 id="gbp.import.new.upstream">
@@ -38,6 +48,8 @@
<screen>
&git-import-orig; <option>--filter</option>=<replaceable>'CVS/*'</replaceable> <filename>/path/to/package_0.2.orig.tar.gz</filename>
</screen>
+ The <option>--filter</option> option can be used multiple times for more
+ complex filtering.
</para>
<para>
If you expect a merge conflict you can delay the merge to the
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>