chiark / gitweb /
~ianmdlvl / dgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 1d38a8e) | patch
git-debrebase: merge: Introduce $mwrecknote in walk analysis half
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 11 Aug 2018 15:23:22 +0000 (16:23 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 11 Aug 2018 16:05:56 +0000 (17:05 +0100)
commitc10954df2a6f7ed9f12e12f6e65049d78c9672e4
treedfa1e5521e74427cce27acd114cdf5f94a66cb08tree | snapshot
parent1d38a8e35e08d9a37393a809f8de4492759f4be3commit | diff
git-debrebase: merge: Introduce $mwrecknote in walk analysis half

We collect various git objects that we may want to present to the user
as wreckage.  Currently we dump them in $cl and print them out in
$nomerge.  We'll want to do better than that of course.

Also, we don't collect any wreckage for the actual series merge yet.

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.