diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-19 20:44:29 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-19 21:14:39 +0100 |
| commit | 7bc6dfb448ed6279adb7a3eafa3dcc86a2c111b5 (patch) | |
| tree | 30b12593ca68f6e45a6caaccdaad80881e03207f /git-debrebase.1.pod | |
| parent | 91f6d93d44a430cb206457e356f70eda18f714a0 (diff) | |
git-debrebase: Merges: Enable with command-line option instead of env var
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
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 |