From: Sverre Rabbelier <srabbelier@gmail.com>
Date: Tue, 26 Oct 2010 20:04:58 GMT
Subject: Re: history missing
Message-ID: <AANLkTi=wbC5F6RFeP2K5J3R2+eMrj0H0i9RnGfS9ALq7@mail.gmail.com>
In-Reply-To: <AANLkTikFB5HNOmg0iTdjHxtrhU9vdua5O8btgFzpg-2F@mail.gmail.com>

Heya,

On Tue, Oct 26, 2010 at 12:47, Vitaliy Semochkin <vitaliy.se@gmail.com> wrote:
> I cloned a remote repository
> to check recent changes in origin/master I do:
> git fetch origin master
> git log origin master

So, you can either of:

$ git pull origin master # fetches and merges
$ git log origin/master # looks at what upstream has but that you have
not merged yet
$ git rebase origin/master # rebase your changes on top of upstream
$ git merge origin/master # merge with upstream

-- 
Cheers,

Sverre Rabbelier