diff options
authorIan Jackson <>2018-06-21 01:22:24 +0100
committerIan Jackson <>2018-06-21 01:32:31 +0100
commit00c7c161dc66c4db4645b2cfd90d810a17a08f46 (patch)
parentc4a96d7a9ed9f83abed11a84f7fe068e27dee2b1 (diff)
dgit(1): Clarify that --overwrite does nothing if not needed.
Closes:#863578. Related to #863576 too. Signed-off-by: Ian Jackson <>
2 files changed, 4 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 437bd53..df25a84 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
dgit (5.2~) unstable; urgency=medium
* dgit(1): Mention under `dgit build' that it uses the network.
+ * dgit(1): Clarify that --overwrite does nothing if not needed.
+ Closes:#863578.
* When all Debian changes vanish with single-debian-patch,
diff --git a/dgit.1 b/dgit.1
index ef5236a..6ee22e8 100644
--- a/dgit.1
+++ b/dgit.1
@@ -489,7 +489,7 @@ push will still ensure that the .dsc you upload and the git tree
you push are identical, so this option won't make broken pushes.)
.BR --overwrite [=\fIprevious-version\fR]
-Declare that even though your git branch is not a descendant
+Declare that even though your git branch may not be a descendant
of the version in the archive
according to the revision history,
it really does contain
@@ -510,7 +510,7 @@ changes unless someone committed to git a finalised changelog
entry, and then made later changes to that version.)
dgit push --overwrite
-will make a
+will, if necessary, make a
pseudo-merge (that is, something that looks like the result
of git merge -s ours) to stitch the archive's version into your own
git history, so that your push is a fast forward from the archive.