chiark / gitweb /
~ianmdlvl / dgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 393232b) | patch
git-debrebase: merge: Detect octopi later
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 11 Aug 2018 08:59:31 +0000 (09:59 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 11 Aug 2018 09:31:17 +0000 (10:31 +0100)
commit9d98fd69e8abee17a59d27023e87215d55eb9385
tree8d7b58102d4048f603bba5922a8e8b3e41edfe55tree | snapshot
parent393232b616d2d602f5cb8a81362ddbec7ee7e9fecommit | diff
git-debrebase: merge: Detect octopi later

If git-debrebase or dgit were to make an octopus merge, we should
recognise that as an unknown kind of gdr/dgit merge, not as a general
octopus merge.  This code motion leaves a spot where such a new kind
of merge could be classified.

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.