[M3devel] github

[Dragiša Durić]

It is a merge operation. You can study "git status” output at any time, but after you “git pull” two operations are done implicitly. One is “git fetch” and this operation updates your local copy of origin/master branch. Second is "git merge” and this operation merges origin/master to your master. Files changed by other people can show in your commit, but that is how DAG of Git commits synchronizes.

All looks well in repo.

On 26 Aug 2014, at 23:12, Tony Hosking <hosking at cs.purdue.edu> wrote:

> Something weird happened on my recent git commit.
> Why did I end up committing thousands of files?
> 
> Antony Hosking | Associate Professor | Computer Science | Purdue University
> 305 N. University Street | West Lafayette | IN 47907 | USA
> Mobile +1 765 427 5484
> 
> 
> 
> 
> 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://m3lists.elegosoft.com/pipermail/m3devel/attachments/20140827/00b0d914/attachment-0002.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 495 bytes
Desc: Message signed with OpenPGP using GPGMail
URL: <http://m3lists.elegosoft.com/pipermail/m3devel/attachments/20140827/00b0d914/attachment-0002.sig>