changelog: start 9.13

[dgit.git] / dgit.1

diff --git a/dgit.1 b/dgit.1
index 9de679dbe10a881353e0bede6d1205dc27f99dcc..f1ead733597f4cd44ec1fbec2ce5e0deae521a08 100644 (file)
--- a/dgit.1
+++ b/dgit.1
@@ -680,7 +680,8 @@ unless you know what you are doing.
 This option is useful if you are the maintainer, and you have
 incorporated NMU changes into your own git workflow in a way that
 doesn't make your branch a fast forward from the NMU.
-It can also be useful when an intermediate upload was not done with dgit.
+It can also be useful when there was an upload made without dgit
+since the most recent upload made with dgit.
 
 This option is also usually necessary
 the first time a package is pushed with dgit push
@@ -792,7 +793,7 @@ The meanings of
 understood in the context of Debian are discussed below:
 .TP
 .BR --deliberately-not-fast-forward
-Declare that you are deliberately rewinding history.
+Declare that you are deliberately rewriting history.
 This could be because your branch is not fast forward from the
 dgit server history,
 or not fast forward from a locally-synthesised dsc import.
@@ -824,7 +825,7 @@ never-accepted) versions in the git history of your current push, were
 rejected by ftpmaster for copyright or redistributability reasons.
 .TP
 .BR --deliberately-fresh-repo
-Declare that you are deliberately rewinding history and want to
+Declare that you are deliberately rewriting history and want to
 throw away the existing repo.  Not relevant when pushing to Debian,
 as the Debian server will do this automatically when necessary.
 .TP