chiark / gitweb /
~ianmdlvl / dgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: eec3f8c) | patch
git-debrebase: merge: Defeat evals which might try to trap merge_failed
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 11 Aug 2018 17:55:04 +0000 (18:55 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 11 Aug 2018 19:11:09 +0000 (20:11 +0100)
commit343532497ca085d0ed5a56982953cb4edcd151bc
treee3de0cfbfccd6ef59532c4fc402cdf590104c16etree | snapshot
parenteec3f8c097bdb3f03499c9228f42d5cd2ce65786commit | diff
git-debrebase: merge: Defeat evals which might try to trap merge_failed

That would be dangerous because we're in the wrong directory and other
things may be wrong.  For example, if we continue we might overwrite
wreckage with other wreckage.

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.