diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-19 12:26:56 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-19 12:26:57 +0100 |
| commit | 67a6338276dd0d5d81e3fff493a00dbc83e270b6 (patch) | |
| tree | 444fc6a513327381ba34f6c8037794eac049ed12 | |
| parent | 49d414e316753377623e913e4576384986c108b8 (diff) | |
dgit(1): Encourage --overwrite rather than --overwrite=version.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | dgit.1 | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 28b4811..f076965 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. -- @@ -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. |