X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit-maint-native.7.pod;h=ac57728cea1d8f573cdeafbcc9bb70aa6d2fd052;hp=54407596dc905585d50f7a6d5a875d193f9ed3b3;hb=e8ab02477159b5bd91a3566dc28367ed4a910b3a;hpb=cb809d942c58dea5dfba6ad8b7e3298338ebb24e

diff --git a/dgit-maint-native.7.pod b/dgit-maint-native.7.pod
index 54407596..ac57728c 100644
--- a/dgit-maint-native.7.pod
+++ b/dgit-maint-native.7.pod
@@ -4,8 +4,9 @@ dgit - tutorial for package maintainers of Debian-native packages
 
 =head1 INTRODUCTION
 
-This document describes elements of a workflow for maintaining a
-native Debian package using B<dgit>.
+This document describes elements of a workflow for using B<dgit> to
+maintain a Debian package that uses one of the native source formats
+("1.0" & "3.0 (native)").
 
 =over 4
 
@@ -64,6 +65,10 @@ Simply prepare your git tree in the usual way, and then:
 
 (Do not make any tags yourself: dgit push will do that.)
 
+You may use B<dgit pbuilder> or B<dgit cowbuilder>
+instead of B<dgit sbuild>;
+see dgit(1) for the syntax of those subcommands.
+
 The --overwrite option tells dgit that you are expecting
 that your git history is not a descendant of the
 history which dgit synthesised from the previous
@@ -77,6 +82,14 @@ so that your history,
 which will be pushed to the dgit git server,
 is fast forward from the dgit archive view.
 
+Alternatively,
+if this was the first ever dgit push of the package,
+you can avoid this merge commit by
+passing C<--deliberately-not-fast-forward>.
+instead of C<--overwrite>.
+This avoids introducing a new origin commit into
+your git history.
+
 =head1 SUBSEQUENT PUSHES
 
 =over 4