diff options
Diffstat (limited to 'git-debrebase.1.pod')
-rw-r--r-- | git-debrebase.1.pod | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod index ca81c19..7ad1ab9 100644 --- a/git-debrebase.1.pod +++ b/git-debrebase.1.pod @@ -496,6 +496,20 @@ This is provided mostly for the benefit of the test suite. Requests (more) debugging. May be repeated. +=item --experimntal-merge-resolution + +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. + =back =head1 UNSTITCHING AND LAUNDERING |