From: Matthieu Moy <matthieu.moy@imag.fr>
Date: Thu, 16 Apr 2009 17:03:31 GMT
Subject: Re: how to check what your pulling down?
Message-ID: <vpq7i1kttss.fsf@bauges.imag.fr>
In-Reply-To: <7vfxg8k0mk.fsf@gitster.siamese.dyndns.org>

Junio C Hamano <gitster@pobox.com> writes:

> cantona <adam@dwpub.com> writes:
>
>> I've been using basic git for a while (add,comit,push,pull) and have
>> recently discovered stash,merge,branch :)
>>
>> My question: before I pull down I always get that bad feeling... "what am i
>> gunna get? will there be a conflict?".
>
> "will there be a conflict?" is an unfounded fear people seem to be unable
> to shake off from their old scm days.

But still, if you want to know what's new without touching your work
at all, "git fetch" is your friend: it fetches new commits from
another repository, without merging them with your branches. Running
"gitk --all" right after a "git fetch" should help understanding what
it did.

-- 
Matthieu