From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 4 Oct 2018 01:36:20 +0000 (+0100)
Subject: git-debrebase: merges: Make warnings of lossage less overblown
X-Git-Tag: archive/debian/7.0~5
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=33ab412087f8c2403bd0f79f787d04b09e565ffb

git-debrebase: merges: Make warnings of lossage less overblown

In particular, everyone's gdr (if it's new enough) should cope with
the generated merged-breakwaters commits.  And there are at least a
couple of tests now, so the risks of total craziness are lower.

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

diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod
index 1156825c..04a57ee2 100644
--- a/git-debrebase.1.pod
+++ b/git-debrebase.1.pod
@@ -515,14 +515,11 @@ Requests (more) debugging.  May be repeated.
 Enable experimental code for handling general merges
 (see L<git-debrebase(5)/General merges>).
 
-This option may generate branch structures that
-require the use of this same option by other people.
-Also you may experience lossage of various kinds,
-including false error messages,
-references to nonexistent documentation,
-being handed an incomprehensible pile of
-multidimensional merge wreckage,
-and/or possible mangling of your package's source code.
+This option may generate lossage of various kinds,
+including misleading error messages,
+references to nonexistent documentation, and
+you being handed an incomprehensible pile of
+multidimensional merge wreckage.
 
 =back