From 33ab412087f8c2403bd0f79f787d04b09e565ffb Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Thu, 4 Oct 2018 02:36:20 +0100 Subject: [PATCH] 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 --- git-debrebase.1.pod | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) 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). -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 -- 2.30.2