git-debrebase: merges: Make warnings of lossage less overblown

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

diff --git a/dgit-maint-native.7.pod b/dgit-maint-native.7.pod
index 03aee59b361ab3365fd3d9f95a850f00f35c35e4..ac57728cea1d8f573cdeafbcc9bb70aa6d2fd052 100644 (file)
--- a/dgit-maint-native.7.pod
+++ b/dgit-maint-native.7.pod
@@ -65,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.)
 
 
 (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
 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


@@ -78,6 +82,14 @@ so that your history,
 which will be pushed to the dgit git server,
 is fast forward from the dgit archive view.
 
 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
 =head1 SUBSEQUENT PUSHES
 
 =over 4