chiark / gitweb /
~ianmdlvl / dgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 75581df) | patch
dgit: dopush pseudomerge, break apart from quilt fixup
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Tue, 21 May 2019 12:39:44 +0000 (13:39 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Fri, 28 Jun 2019 11:45:38 +0000 (12:45 +0100)
commitd01fd9703f518305690d7fe79883a1365b343feb
tree01dbf2a1da1ad65b107f439c344336f229f24900tree | snapshot
parent75581df3d6c82c3727971756a028b7b2a4d97dcecommit | diff
dgit: dopush pseudomerge, break apart from quilt fixup

In the future, we are going to have split brain in situations without
any quilt fixup.  We will use $do_split_brain for this.

In that situation, do the splitbrain pseudomerge too.

No actual functional change yet.

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