dgit-*(7): --deliberately-not-fast-forward for first dgit push

Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>

diff --git a/dgit-maint-gbp.7.pod b/dgit-maint-gbp.7.pod
index c31dfa5956dbfe48e01bea5b8cd2b393eac39e7e..3c438ab101b41f069ed9cbfa29b46b12c01c3b02 100644 (file)
--- a/dgit-maint-gbp.7.pod
+++ b/dgit-maint-gbp.7.pod
@@ -111,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.
 
 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
 =head1 INCORPORATING NMUS
 
 B<dgit pull> can't yet incorporate NMUs into patches-unapplied gbp

diff --git a/dgit-maint-merge.7.pod b/dgit-maint-merge.7.pod
index cfbe1c35fd322aa00d20ee080fd1292f09707a64..22be1c9e2199244acf697bb747d1ed4c3fff1d43 100644 (file)
--- 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>.
 
 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
 
 
 =head1 SOURCE PACKAGE CONFIGURATION
 

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

diff --git a/dgit-sponsorship.7.pod b/dgit-sponsorship.7.pod
index 8d5b72daa2de1e42b11820c132cda72c260d3ce9..08083290c1139e14bd83cc7b41733ee1b4a89816 100644 (file)
--- a/dgit-sponsorship.7.pod
+++ b/dgit-sponsorship.7.pod
@@ -257,6 +257,14 @@ you may need to pass
 C<--overwrite>
 to dgit.
 
 C<--overwrite>
 to dgit.
 

+Alternatively,
+if this was the first ever dgit push of the package,
+you can pass C<--deliberately-not-fast-forward>
+instead of C<--overwrite>.
+This avoids introducing a new origin commit
+into the dgit view of
+the sponsee's git history
+which is unnecessary and could be confusing.

 
 =head1 SPONSORING A NON-GIT-USING SPONSEE
 
 
 =head1 SPONSORING A NON-GIT-USING SPONSEE