chiark / gitweb /
~ianmdlvl / dgit.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from: c386ae2)
git-debrebase: do not bomb on totally ambiguous pseudomerges
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 17 Feb 2018 22:51:16 +0000 (22:51 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 16 Jun 2018 15:06:58 +0000 (16:06 +0100)
Actually, we want `git-merge -s ours' (or `git-debrebase stitch')
to be comprehended.  We sacrifice `git-merge -s theirs'.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

No differences found
Unnamed repository; edit this file 'description' to name the repository.