Re: VC mode and git

[Eli Zaretskii]

> From: Sergey Organov <address@hidden>
> Date: Thu, 02 Apr 2015 20:02:02 +0300
> 
> >> > A merge does much more than just commit.  At least AFAIU.
> >> 
> >> Dunno what you have in mind.
> >
> > The changes to meta-data that reflect the changes in the history DAG.
> 
> No meta-data outside of the commit, AFAIK.
> 
> Each commit has zero or more pointers to parents, usually 1. Merge
> commit is commit that has more pointers to parents than 1 (usually 2).
> That's all about the meta-data. Simple, eh?

And that meta-data needs to be brought in as part of the merge, in
addition to changes to the tree.

You can call all of this a "commit", but then you probably mean
"commit object", a different beast.  Using confusing shorts in this
discussion doesn't help understanding.