chiark / gitweb /
~ianmdlvl / dgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 17474e7) | patch
dgit: Interoperate with git-debrebase, automatically
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Mon, 23 Apr 2018 11:45:58 +0000 (12:45 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 17 Jun 2018 10:56:34 +0000 (11:56 +0100)
commit6c5051457d8e3decc94625cf5bf218be6d6d7fcc
tree6a5906547fca219a400ec6f23f0058a5b08067d7tree | snapshot
parent17474e7732a9a3fcba657bec60264c2629724d5ecommit | diff
dgit: Interoperate with git-debrebase, automatically

* Recognise gdr branches, by the presence of corresponding
  ffq-prev or debrebase-last refs.

* Before trying to do our own multi-patch linear quilt fixup, on a gdr
  branch, see if gdr can do it.  If so that is faster and better.

* If our branch is an unstitched gdr branch, which would be ff from
  the archive if we were to stitch it, then do so.

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