chiark / gitweb /
~ianmdlvl / dgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: dea27c6) | patch
git-debrebase: Merge: Remove some xxx's
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 19 Aug 2018 19:25:16 +0000 (20:25 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 19 Aug 2018 20:00:31 +0000 (21:00 +0100)
commit6392501bee3f167ca61ba648413190ac83cf4257
tree80f9718e72dbea63db7e35273b6c3f5adb1ee296tree | snapshot
parentdea27c626d6c39d11a1b591005fd2e6e2a17e295commit | diff
git-debrebase: Merge: Remove some xxx's

git-debrebase(5) already has ILLEGAL OPERATIONS (which forbids many
git-rebase operations) and also of course LEGAL OPERATIONS.

The limitations on what kind of merges we can resolve and how will be
documented when we document the merge machinery properly.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
git-debrebase diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.