From 16dd3ffe595a585adc0fffb7f4ab97b29807911b Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 25 Sep 2016 21:21:59 +0100 Subject: Overwrite: Document --overwrite=VERSION Signed-off-by: Ian Jackson --- dgit | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'dgit') diff --git a/dgit b/dgit index 2bd938e..4e31605 100755 --- 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."; } } -- cgit v1.2.3