chiark / gitweb /
~ianmdlvl / dgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: a31d506) | patch
git-debrebase: merge: New record-resolved-merge subcommand, WIP
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 11 Aug 2018 19:26:41 +0000 (20:26 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 12 Aug 2018 00:26:19 +0000 (01:26 +0100)
commit5ad9edffc1e0658f287b45feccbd7c97e0bfd412
treed0afb5f51ebac1469e5f71e78743f01c19f21d71tree | snapshot
parenta31d506d5ba29726b661ecd40092c8fbebfa865fcommit | diff
git-debrebase: merge: New record-resolved-merge subcommand, WIP

Right now this seems to be able to generate some commit, but
it doesn't know how to record it.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
git-debrebase diff | blob | history
tests/tests/gdr-merge-conflicts diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.