dgit(1): Cover more cases of --overwrite and --deliberately

[dgit.git] / dgit.1

diff --git a/dgit.1 b/dgit.1
index e619188434c988aaf9cc7bf4974fcfc78c66d560..9de679dbe10a881353e0bede6d1205dc27f99dcc 100644 (file)
--- a/dgit.1
+++ b/dgit.1
@@ -680,6 +680,7 @@ 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.
 
 This option is also usually necessary
 the first time a package is pushed with dgit push
@@ -792,10 +793,15 @@ understood in the context of Debian are discussed below:
 .TP
 .BR --deliberately-not-fast-forward
 Declare that you are deliberately rewinding 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.
+
 When pushing to Debian,
-use this when you are making a renewed upload of an entirely
+use this only when you are making a renewed upload of an entirely
 new source package whose previous version was not accepted for release
-from NEW because of problems with copyright or redistributibility.
+from NEW because of problems with copyright or redistributibility;
+or, exceptionally, for the very first upload with dgit.
 
 When split view is in operation,
 this also prevents the construction by dgit of a pseudomerge
@@ -1340,7 +1346,7 @@ See Debian bug #841867.
 .BR \-\-for\-push
 Override the dgit-distro.distro.readonly configuration setting,
 to specify that we have read/write access
-and should use the corresponding git and achive access approach
+and should use the corresponding git and achieve access approach
 even if the operation is a read-only one.
 .SH CONFIGURATION
 dgit can be configured via the git config system.