diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-10-04 02:36:20 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-10-04 16:33:23 +0100 |
| commit | 33ab412087f8c2403bd0f79f787d04b09e565ffb (patch) | |
| tree | a9ed341e5db209dd50de69b9feb2dad52721048f /git-debrebase.1.pod | |
| parent | ce6c1132ed0bc49b51321fb725485cde00c226e1 (diff) | |
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>
Diffstat (limited to 'git-debrebase.1.pod')
| -rw-r--r-- | git-debrebase.1.pod | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod index 1156825..04a57ee 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 |