dgit(1): Encourage --overwrite rather than --overwrite=version.

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

diff --git a/debian/changelog b/debian/changelog
index 28b4811de3feabc60a3117c6bc3e753e6a1ed8b9..f076965e1ec6491833baa7a4ba285c2b32f11111 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ dgit (6.7~) unstable; urgency=medium
   * git-debrebase: Do not bail making patches if there aren't any.
   * test suite: Set DEBFULLNAME
   * git-debrebase: scrap works properly when it does only rebase --abort.
   * git-debrebase: Do not bail making patches if there aren't any.
   * test suite: Set DEBFULLNAME
   * git-debrebase: scrap works properly when it does only rebase --abort.

+  * dgit(1): Encourage --overwrite rather than --overwrite=version.

 
  --
 
 
  --
 

diff --git a/dgit.1 b/dgit.1
index a21f212dc94382ae528a028254122585a7b15937..4aea52f0b55562d24358c9fab7a9760c83e5366b 100644 (file)
--- a/dgit.1
+++ b/dgit.1
@@ -604,6 +604,13 @@ your git branch is not a descendant
 of the version in the archive
 according to the git revision history.
 
 of the version in the archive
 according to the git revision history.
 

+It is safer not to specify
+.IR previous-version ,
+and usually it's not needed.
+Just say
+.BR --overwrite ,
+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.
 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.