Daniel Barkalow <barkalow@xxxxxxxxxxxx> writes: >> Why is this a good change? > > It was always using a temporary file; it just used to use a temporary file > that was a shell script fragment and needed to be read with "eval". It > can't be done entirely in core because it may be determined before a > conflict and only used when run with --continue after the user resolves > the conflict. Ahh, Ok. Using a _known_ and defined format, instead of ad-hoc scriptlet, is an improvement. I still wonder if we can avoid using three separate "git show" and "git config" invocations, though. But a half of that inefficiency will go away when this is migrated to C, as a single git_config() will grab all three, although the writing side is still very inefficient X-<. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html