Declare fast forward from 0.22-experimental2

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

diff --git a/dgit-maint-gbp.7.pod b/dgit-maint-gbp.7.pod
index 53d147a045ff2f681413b3fa76054b77f1908a68..c31dfa5956dbfe48e01bea5b8cd2b393eac39e7e 100644 (file)
--- a/dgit-maint-gbp.7.pod
+++ b/dgit-maint-gbp.7.pod
@@ -22,10 +22,6 @@ 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
@@ -50,11 +46,7 @@ branch, never the dgit patches-applied branch.
 
 =head1 BUILDING
 
-If you use gbp-buildpackage(1) to generate your orig tarballs, you
-will need to perform the first build with gbp-buildpackage(1) directly
-(this is due to Debian bug #841084).
-
-Otherwise, you can perform builds like this:
+You can perform builds like this:
 
 =over 4
 
@@ -121,14 +113,9 @@ performed with dgit.
 
 =head1 INCORPORATING NMUS
 
-=over 4
-
-    % dgit --gbp pull
-
-=back
-
-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