On Wed, Jul 01, 2015 at 01:47:15PM +0000, Nelson Efrain A. Cruz wrote:
> This happens depending on how the history of the repos has diverged.
> Basically when you make a pull you are doing a fetch and a merge in the
> background. So there are two types of merges, one of them ends with a
> commit merge the other don't.
> It's better explained in
> https://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging

In particular you need to understand the difference between an
ordinary merge and a fast-forward.


Magnus Therning                      OpenPGP: 0xAB4DFBA4 
email: mag...@therning.org   jabber: mag...@therning.org
twitter: magthe               http://therning.org/magnus

I have steadily endeavored to keep my mind free, so as to give up any
hypothesis, however much beloved -- and I cannot resist forming one
on every subject -- as soon as facts are shown to be opposed to it.
     -- Charles Darwin (1809-1882)

You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Attachment: signature.asc
Description: PGP signature

Reply via email to