Stupid git commit-tree tricks, Part 2: Building a merge commit manually out of a tree