chiark / gitweb /
git-debrebase: merge: Comment about laundry of merge of unstitched
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 11 Aug 2018 10:43:40 +0000 (11:43 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 11 Aug 2018 10:43:40 +0000 (11:43 +0100)
commite8ab02477159b5bd91a3566dc28367ed4a910b3a
tree6fcce5bf71850aa27297421a108a71073f3d1a34
parent892352e386b2908574d660df3ee778171f59995b
git-debrebase: merge: Comment about laundry of merge of unstitched

I have concluded that this is not a problem avoidable by
git-debrebase, and that any trouble will be tolerable (at least, not
data loss).  The user should try to avoid doing this.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
git-debrebase
tests/tests/gdr-merge