X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit-maint-merge.7.pod;h=22be1c9e2199244acf697bb747d1ed4c3fff1d43;hp=cfbe1c35fd322aa00d20ee080fd1292f09707a64;hb=53391de137eb887e0807d7e0339a855c5140451a;hpb=b405f072572fd2e4e2acaa94562b697bc639b86d

diff --git a/dgit-maint-merge.7.pod b/dgit-maint-merge.7.pod
index cfbe1c35..22be1c9e 100644
--- a/dgit-maint-merge.7.pod
+++ b/dgit-maint-merge.7.pod
@@ -241,7 +241,12 @@ To achieve this, you might need to delete
 I<debian/source/local-options>.  One way to have dgit check your
 progress is to run B<dgit build-source>.
 
-The first dgit push will require I<--overwrite>.
+The first dgit push will require I<--overwrite>.  If this is the 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 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 SOURCE PACKAGE CONFIGURATION