dgit --trust-changelog: Recommend in (7) pod manpages

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

6 files changed, 17 insertions, 17 deletions

diff --git a/dgit-maint-bpo.7.pod b/dgit-maint-bpo.7.pod
index 86372dd..672751c 100644
--- a/dgit-maint-bpo.7.pod
+++ b/dgit-maint-bpo.7.pod
@@ -126,7 +126,7 @@ I<1.2.2-1~bpo10+1> and you have now prepared I<1.2.3-1~bpo10+1> for
 upload.  When you B<dgit push>, you will need to pass
 I<--overwrite=1.2.2-1~bpo10+1>.
 
-Alternatively, you can perform the pseudomerge that I<--overwrite>
+Alternatively, you can perform the pseudomerge that I<--trust-changelog>
 would have done yourself:
 
 =over 4
diff --git a/dgit-maint-debrebase.7.pod b/dgit-maint-debrebase.7.pod
index 8787072..4d6feb6 100644
--- a/dgit-maint-debrebase.7.pod
+++ b/dgit-maint-debrebase.7.pod
@@ -491,7 +491,7 @@ I<--new> if the package is new in the target suite.
 In some cases where you used B<git debrebase convert-from-gbp> since
 the last upload, it is not possible for dgit to make your history
 fast-forwarding from the history on B<dgit-repos>.  In such cases you
-will have to pass I<--overwrite> to dgit.  git-debrebase will normally
+will have to pass I<--trust-changelog> to dgit.  git-debrebase will normally
 tell you if this will be needed.
 
 If you want to upload with git-debpush(1), for the first upload you
@@ -632,7 +632,7 @@ reversion from the delta queue.
 If you cannot rebase because you have already pushed to
 B<salsa.debian.org>, say, you can manually apply the NMU debdiff,
 commit and debrebase.  The next B<dgit push> will require
-I<--overwrite>.
+I<--trust-changelog>.
 
 =head1 HINTS AND TIPS
 
@@ -688,7 +688,7 @@ branches for your upstream remote, e.g. I<remotes/upstream/master>.
 =head2 The first ever dgit push
 
 If this is the first ever dgit push of the package, consider passing
-I<--deliberately-not-fast-forward> instead of I<--overwrite>.  This
+I<--deliberately-not-fast-forward> instead of I<--trust-changelog>.  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.)
diff --git a/dgit-maint-gbp.7.pod b/dgit-maint-gbp.7.pod
index 1988a31..a27a5fa 100644
--- a/dgit-maint-gbp.7.pod
+++ b/dgit-maint-gbp.7.pod
@@ -117,11 +117,11 @@ or if you need to include binaries,
 This will push your git history to the dgit-repos, but you probably
 want to follow it up with a push to salsa.
 
-You will need to pass I<--overwrite> if the previous upload was not
+You will need to pass I<--trust-changelog> 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
+I<--deliberately-not-fast-forward> instead of I<--trust-changelog>.  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
@@ -134,7 +134,7 @@ should pass the B<--gbp> quilt mode option (see git-debpush(1)).
 
 B<dgit pull> can't yet incorporate NMUs into patches-unapplied gbp
 branches.  You can just apply the NMU diff the traditional way.  The
-next upload will require I<--overwrite>.
+next upload will require I<--trust-changelog>.
 
 =head1 SEE ALSO
 
diff --git a/dgit-maint-merge.7.pod b/dgit-maint-merge.7.pod
index bfd3758..1cd6491 100644
--- a/dgit-maint-merge.7.pod
+++ b/dgit-maint-merge.7.pod
@@ -278,9 +278,9 @@ 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>.  If this is the first
+The first dgit push will require I<--trust-changelog>.  If this is the first
 ever dgit push of the package, consider passing
-I<--deliberately-not-fast-forward> instead of I<--overwrite>.  This
+I<--deliberately-not-fast-forward> instead of I<--trust-changelog>.  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.)
@@ -504,7 +504,7 @@ that have been forwarded, "retaining" the ones that haven't.
 =back
 
 Alternatively, you can apply the NMU diff to your repository.  The
-next push will then require I<--overwrite>.
+next push will then require I<--trust-changelog>.
 
 =head1 SEE ALSO
 
diff --git a/dgit-maint-native.7.pod b/dgit-maint-native.7.pod
index 4e8b795..e08ab15 100644
--- a/dgit-maint-native.7.pod
+++ b/dgit-maint-native.7.pod
@@ -58,7 +58,7 @@ Simply prepare your git tree in the usual way, and then:
 
 =over 4
 
-    % dgit -wgf --overwrite push-source
+    % dgit -wgf --trust-changelog push-source
 
 =back
 
@@ -68,7 +68,7 @@ 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
+The --trust-changelog option tells dgit that you are expecting
 that your git history is not a descendant of the
 history which dgit synthesised from the previous
 non-dgit uploads.
@@ -85,7 +85,7 @@ 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>.
+instead of C<--trust-changelog>.
 This avoids introducing a new origin commit into
 your git history.
 
@@ -120,7 +120,7 @@ you can do this:
 =back
 
 If you do not merge the NMU into your own git history,
-the next push will then require I<--overwrite>.
+the next push will then require I<--trust-changelog>.
 
 =head1 SEE ALSO
 
diff --git a/dgit-sponsorship.7.pod b/dgit-sponsorship.7.pod
index 7949279..1e070f2 100644
--- a/dgit-sponsorship.7.pod
+++ b/dgit-sponsorship.7.pod
@@ -259,13 +259,13 @@ should go on the sponsee's branch.)
 
 If this was the first upload done with dgit,
 you may need to pass
-C<--overwrite>
+C<--trust-changelog>
 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>.
+instead of C<--trust-changelog>.
 This avoids introducing a new origin commit
 into the dgit view of
 the sponsee's git history
@@ -314,7 +314,7 @@ dgit push-source
 directly from the "sponsee" branch.
 
 You will need to pass
-C<--overwrite>
+C<--trust-changelog>
 to dgit push for every successive upload.
 This disables a safety catch which would normally spot
 situations where changes are accidentally lost.