dgit: --trust-changelog: Recommend rather than --overwrite

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

1 files changed, 2 insertions, 2 deletions

diff --git a/dgit b/dgit
index 4fb38ec..a327781 100755
--- a/dgit
+++ b/dgit
@@ -4397,7 +4397,7 @@ sub splitbrain_pseudomerge ($$$$) {
 	print STDERR <<END.(__ <<ENDT);
 $@
 END
-| Not fast forward; maybe --overwrite is needed ?  Please see dgit(1).
+| Not fast forward; maybe --trust-changelog is needed ?  Please see dgit(1).
 ENDT
 	finish -1;
     }
@@ -4810,7 +4810,7 @@ END
 	    fail __ "dgit push: HEAD is not a descendant".
 	        " of the archive's version.\n".
 		"To overwrite the archive's contents,".
-		" pass --overwrite[=VERSION].\n".
+		" pass --trust-changelog, or --overwrite=VERSION.\n".
 		"To rewrite history, if permitted by the archive,".
 		" use --deliberately-not-fast-forward.";
 	}