diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-09-25 21:21:59 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-09-26 01:36:29 +0100 |
commit | 16dd3ffe595a585adc0fffb7f4ab97b29807911b (patch) | |
tree | 2ab82c43f1ec78f1db0c4b80ef51a0caa68af682 /dgit | |
parent | 6a009a8fe0fa46c0d92d51300566c7afcf21ed2e (diff) |
Overwrite: Document --overwrite=VERSION
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'dgit')
-rwxr-xr-x | dgit | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -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."; } } |