diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2018-10-10 08:40:06 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2018-10-10 08:40:06 -0700 |
| commit | bd5ec77ecd3c3377d7473ae055b88325aef3696b (patch) | |
| tree | d6281cf838da6b8c5e218a1e7615d682c1a4dc89 /git-debrebase.1.pod | |
| parent | 11a5cbb0e28d391324948cec33b1d40499f16d3b (diff) | |
| parent | fa303f348f6fe529cafdc5b91f9a15bddefd2b56 (diff) | |
Merge tag 'debian/7.0' into stretch-bpo
dgit release 7.0 for unstable (sid) [dgit]
[dgit distro=debian]
# gpg: Signature made Thu 04 Oct 2018 12:36:14 PM MST
# gpg: using RSA key 559AE46C2D6B6D3265E7CBA1E3E3392348B50D39
# gpg: Can't check signature: No public key
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 |