X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit.1;h=2233d95941fa34f9ec4ac9e9a4a77c25f77cda34;hp=e5b4bb050b6145a30a72299733622b768677c125;hb=d99fbfc09e25cda5a7e95c3c632436d22cb4e59a;hpb=6f34401683b2647435379639f9a06ef639b295f7

diff --git a/dgit.1 b/dgit.1
index e5b4bb05..2233d959 100644
--- a/dgit.1
+++ b/dgit.1
@@ -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)
+and
+--deliberately-not-fast-forward
+(which suppresses the pseudomerge and the fast forward checks)
+should be needed;
+--overwrite is usually better.
 .TP
 .BR --deliberately-include-questionable-history
 Declare that you are deliberately including, in the git history of