X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit-maint-gbp.7.pod;h=c31dfa5956dbfe48e01bea5b8cd2b393eac39e7e;hp=09cca22b674ec769ec9da9189e570cc47ed8d828;hb=9ceee050983cec221d82053c3e6f6bbbd9ca5f2c;hpb=d2b944ee3787199f1e3c74794877cc92a2309475

diff --git a/dgit-maint-gbp.7.pod b/dgit-maint-gbp.7.pod
index 09cca22b..c31dfa59 100644
--- 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
@@ -45,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
 
@@ -111,16 +108,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
+You will need to pass I<--overwrite> if the previous upload was not
+performed with dgit.
 
-=over 4
-
-    % dgit --gbp pull
-
-=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