dgit(1): Clarify that --overwrite does nothing if not needed.

Closes:#863578.  Related to #863576 too.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/debian/changelog b/debian/changelog
index 437bd53bfd24981b5aa9f5a1f2eff9609276cd29..df25a84630e34cf7da702c93f48d5972fe2dbcc7 100644 (file)
--- 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 (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.

 
   dgit:
   * When all Debian changes vanish with single-debian-patch,
 
   dgit:
   * When all Debian changes vanish with single-debian-patch,

diff --git a/dgit.1 b/dgit.1
index ef5236a4ce70c3aaadd637ba87ba948069ec51e8..6ee22e822082330ad82f2f2d0ac85c27a82881d2 100644 (file)
--- 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.)
 .TP
 .BR --overwrite [=\fIprevious-version\fR]
 you push are identical, so this option won't make broken pushes.)
 .TP
 .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
 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
 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.
 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.