Overwrite: Fix messages referring to --overwrite-version

[dgit.git] / dgit

diff --git a/dgit b/dgit
index 2bd938e5a1149017413ce7ee2d2015afe6c855e4..18e485a0bbcdbf6828bc558e1b7d4ebdd3ede78a 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -2480,7 +2480,7 @@ sub splitbrain_pseudomerge ($$$$) {
        (defined $overwrite_version ? <<END_OVERWR : <<END_MAKEFF);
 Declare fast forward from $overwrite_version
 
-[dgit --quilt=$quilt_mode --overwrite-version=$overwrite_version]
+[dgit --quilt=$quilt_mode --overwrite=$overwrite_version]
 END_OVERWR
 Make fast forward from $i_arch_v->[0]
 
@@ -2516,7 +2516,7 @@ sub plain_overwrite_pseudomerge ($$$) {
        $clogp, $head, $archive_hash, $i_arch_v, <<END;
 $m
 
-[dgit --overwrite-version=$overwrite_version]
+[dgit --overwrite=$overwrite_version]
 END
 
     runcmd @git, qw(update-ref -m), $m, 'HEAD', $r, $head;
@@ -2769,10 +2769,10 @@ END
        } else {
            fail "dgit push: HEAD is not a descendant".
                " of the archive's version.\n".
-               "dgit: To overwrite its contents,".
-               " use git merge -s ours ".lrref().".\n".
-               "dgit: To rewind history, if permitted by the archive,".
-               " use --deliberately-not-fast-forward";
+               "To overwrite the archive's contents,".
+               " pass --overwrite[=VERSION].\n".
+               "To rewind history, if permitted by the archive,".
+               " use --deliberately-not-fast-forward.";
        }
     }