X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit-maint-gbp.7.pod;h=3c438ab101b41f069ed9cbfa29b46b12c01c3b02;hp=134593cba887bf4de573a403996e384b59876313;hb=5f5a11b1abc80453bd91268e859a41757f02313a;hpb=5ea38f628b0d5e75bde4f1aaf686c2ff98d37610

diff --git a/dgit-maint-gbp.7.pod b/dgit-maint-gbp.7.pod
index 134593cb..3c438ab1 100644
--- a/dgit-maint-gbp.7.pod
+++ b/dgit-maint-gbp.7.pod
@@ -46,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
 
@@ -115,6 +111,13 @@ want to follow it up with a push to alioth.
 You will need to pass I<--overwrite> if the previous upload was not
 performed with dgit.
 
+If this is first ever dgit push of the package, consider passing
+I<--deliberately-not-fast-forward> instead of I<--overwrite>.  This
+avoids introducing a new origin commit into the dgit view of your git
+history.  (This origin commit would represent the most recent non-dgit
+upload of the package, but this should already be represented in your
+git history.)
+
 =head1 INCORPORATING NMUS
 
 B<dgit pull> can't yet incorporate NMUs into patches-unapplied gbp