chiark / gitweb /
Overwrite: Document --overwrite=VERSION
[dgit.git] / dgit
diff --git a/dgit b/dgit
index 2bd938e5a1149017413ce7ee2d2015afe6c855e4..4e31605adbf711c3c68232f17085d3eb2b586841 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -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.";
        }
     }