chiark / gitweb /
~ianmdlvl / dgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: ba38205) | 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>
Sun, 18 Feb 2018 12:51:04 +0000 (12:51 +0000)
commit13c7b0760911c9e5f689c0ffcb01ffaeb6a90677
treefcc7835b4a8714a3781cacff8171162f9156796ctree | snapshot
parentba38205249bc71d681f1156355a7581a7c9dc84acommit | 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.