chiark / gitweb /
~ianmdlvl / dgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: ebf4736) | patch
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)
commitc386ae2688431a622f9d41b3668755420fcbed39
treeb8fa63c9356a272da7787296323cba13db5fd673tree | snapshot
parentebf4736038f724689ccc6177d222483fd023866dcommit | diff
git-debrebase: do not bomb on totally ambiguous pseudomerges

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>
git-debrebase diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.