chiark / gitweb /
~ianmdlvl / dgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: da6f19f) | patch
git-debrebase: new-upstream: fix ff check handling of multi-piece upstreams
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Tue, 19 Jun 2018 16:02:27 +0000 (17:02 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Wed, 20 Jun 2018 13:29:38 +0000 (14:29 +0100)
commit8417abd83a6d2659bd556476ddee0a232d579eca
treed04f98bf4295c273884037b2f6c38a57180aebf0tree | snapshot
parentda6f19f4f54e84723e9d1435bcfd4f7db8e55986commit | diff
git-debrebase: new-upstream: fix ff check handling of multi-piece upstreams

Multi-piece combine commits may have n or n+1 parents, depending on
whether the previous new-upstream invocation was snag-free.

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