Tests suite: import-nonnative: Put a .pc in the craziest .orig too

[dgit.git] / dgit-maint-gbp.7.pod

diff --git a/dgit-maint-gbp.7.pod b/dgit-maint-gbp.7.pod
index 09cca22b674ec769ec9da9189e570cc47ed8d828..134593cba887bf4de573a403996e384b59876313 100644 (file)
--- a/dgit-maint-gbp.7.pod
+++ b/dgit-maint-gbp.7.pod
@@ -22,12 +22,13 @@ Provide a better, more detailed git history to downstream dgit users,
 such as people using dgit to do an NMU (see dgit-nmu-simple(7) and
 dgit-user(7)).
 
-=item
-
-Incorporate NMUs with a single command (see below).
-
 =back
 
+Note that we assume a patches-unapplied repository: the upstream
+source committed to the git repository is unpatched.
+git-buildpackage(1) can work with patched-applied repositories, but is
+normally used with patches-unapplied.
+
 =head1 GIT CONFIGURATION
 
 If you run
@@ -111,16 +112,14 @@ Don't use I<--git-tag>: B<dgit push> will do this for you.  To upload:
 This will push your git history to the dgit-repos, but you probably
 want to follow it up with a push to alioth.
 
-=head1 INCORPORATING NMUS
-
-=over 4
-
-    % dgit --gbp pull
+You will need to pass I<--overwrite> if the previous upload was not
+performed with dgit.
 
-=back
+=head1 INCORPORATING NMUS
 
-Alternatively, you can apply the NMU diff to your repository.  The
-next push will then require I<--overwrite>.
+B<dgit pull> can't yet incorporate NMUs into patches-unapplied gbp
+branches.  You can just apply the NMU diff the traditional way.  The
+next upload will require I<--overwrite>.
 
 =head1 SEE ALSO