Re: VC mode and git

[Sergey Organov]

Eli Zaretskii <address@hidden> writes:

>> From: Sergey Organov <address@hidden>
>> Date: Thu, 02 Apr 2015 15:27:18 +0300
>> 
>> Eli Zaretskii <address@hidden> writes:
>> >> From: Sergey Organov <address@hidden>
>> >> Date: Wed, 01 Apr 2015 18:52:20 +0300
>> >> 
>> >> >> "Incorporates changes from the named commits (since the time their
>> >> >> histories diverged from the current branch) into the current branch."
>> >> >
>> >> > Good luck understanding this when learning what merge does in Git!
>> >> > Starting from the "branch" thingy, which, as you will read everywhere
>> >> > is just a pointer to the HEAD commit.  So what does it mean to
>> >> > "incorporate changes in the current branch", if the branch is just a
>> >> > pointer?
>> >> 
>> >> Yes, a pointer that moves to point to new commit automatically every
>> >> time you commit on the branch. Incorporating changes means the same
>> >> thing every time: commit. What's new or unusual about it?
>> >
>> > 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?

-- Sergey.