X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit.1;h=f7c06d06fa0648c9f12525deb434f135a42dd725;hb=5021fff8f4987a866688535b35fc3b7d6008baed;hp=a7346e50300934e75dd1a1894906f4ab2d776257;hpb=44f566983bd41228644176bb0abf5201e471db8d;p=dgit.git

diff --git a/dgit.1 b/dgit.1
index a7346e50..f7c06d06 100644
--- a/dgit.1
+++ b/dgit.1
@@ -631,7 +631,8 @@ This could perhaps be used to detect bugs in your rules clean target.
 .TP
 .BR -N " | " --new
 The package is or may be new in this suite.  Without this, dgit will
-refuse to push.  It may (for Debian, will) be unable to access the git
+refuse to push.
+It may (for Debian, will) be unable to access the git
 history for any packages which have been newly pushed and have not yet
 been published.
 .TP
@@ -790,8 +791,9 @@ 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.  When pushing to
-Debian, use this when you are making a renewed upload of an entirely
+Declare that you are deliberately rewinding history.
+When pushing to Debian,
+use this 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.
 
@@ -1291,6 +1293,13 @@ The result is a fresh import,
 discarding the git history
 that the person who pushed that .dsc was working with.
 .TP
+.B \-\-force-reusing-version
+Carry on even though this involves reusing a version number
+of a previous push or upload.
+It is normally best to give different versions different numbers.
+Some servers (including, usually, the Debian server)
+will reject attempts to reuse or replace already-pushed versions.
+.TP
 .B \-\-force-uploading-binaries
 Carry on and
 upload binaries
@@ -1331,7 +1340,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.
@@ -1358,6 +1367,10 @@ may be a glob pattern.
 .TP
 .BI dgit.default.distro " distro"
 The default distro for an unknown suite.
+
+This is only used if no
+.BI /usr/share/distro-info/ somedistro .csv
+mentions the specified suite.
 .TP
 .BI dgit.default.default-suite " suite"
 The default suite (eg for clone).