From 67a6338276dd0d5d81e3fff493a00dbc83e270b6 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 19 Aug 2018 12:26:56 +0100 Subject: [PATCH] dgit(1): Encourage --overwrite rather than --overwrite=version. Signed-off-by: Ian Jackson --- debian/changelog | 1 + dgit.1 | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index 28b4811d..f076965e 100644 --- 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. + * dgit(1): Encourage --overwrite rather than --overwrite=version. -- diff --git a/dgit.1 b/dgit.1 index a21f212d..4aea52f0 100644 --- 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. +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. -- 2.30.2