On Fri, Jan 19, 2018 at 12:30 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > Johannes Schindelin <Johannes.Schindelin@xxxxxx> writes: > >> Good idea! I would rather do it as an introductory patch (that only >> converts the existing list). >> >> As to `merge`: it is a bit more complicated ;-) >> >> m, merge <original-merge-commit> ( <label> | "<label>..." ) [<oneline>] >> create a merge commit using the original merge commit's >> message (or the oneline, if "-" is given). Use a quoted >> list of commits to be merged for octopus merges. > > Is it just the message that is being reused? > > Aren't the trees of the original commit and its parents participate > in creating the tree of the recreated merge? One way to preserve an > originally evil merge is to notice how it was made by taking the > difference between the result of mechanical merge of original merge > parents and the original merge result, and carry it forward when > recreating the merge across new parents. Just being curious. > It looks like currently that only the commit is kept, with no attempt to recreate evil merges. Thanks, Jake
