|author||Ian Jackson <email@example.com>||2017-02-12 22:20:46 +0000|
|committer||Ian Jackson <firstname.lastname@example.org>||2017-02-12 22:20:46 +0000|
dgit: --deliberately-not-fast-forward works properly in split view quilt modes (suppressing the pseudomerge).
Diffstat (limited to 'dgit.1')
1 files changed, 11 insertions, 0 deletions
@@ -554,6 +554,17 @@ Declare that you are deliberately rewinding history. When pushing to
Debian, use this when you are making a renewed upload of an entirely
new source package whose previous version was not accepted for release
from NEW because of problems with copyright or redistributibility.
+In split view quilt modes,
+this also prevents the construction by dgit of a pseudomerge
+to make the dgit view fast forwarding.
+Normally only one of
+--overwrite (which creates a suitable pseudomerge)
+(which suppresses the pseudomerge and the fast forward checks)
+should be needed;
+--overwrite is usually better.
Declare that you are deliberately including, in the git history of