"Elijah Newren via GitGitGadget" <gitgitgadget@xxxxxxxxx> writes: > This series introduces a new option to git-merge-tree: --real (best name I > could come up with). This new option is designed to allow a server-side > "real" merge (or allow folks client-side to do merges with branches they > don't even have checked out). Finally. merge-tree was added by Linus mostly as a demonstration of idea to trick other developers into enhancing it to implement a full merge that does not need to touch the index or the working tree, but everybody failed to be enticed by it so far. It is true that it can be used server-side, but I do not think that is what we want to sell it as (after all, receiving a push, merging it to the history in the central repository, and checking the result out to the working tree, would be a good "server-side" operation to have, but it can be done today without this series). The selling point would rather be it is done mostly in-core, without touching working tree or the index file, no? Exciting ;-).
