All of lore.kernel.org
 help / color / mirror / Atom feed
From: Matthieu Moy <Matthieu.Moy@imag.fr>
To: Junio C Hamano <gitster@pobox.com>
Cc: cantona <adam@dwpub.com>, git@vger.kernel.org
Subject: Re: how to check what your pulling down?
Date: Thu, 16 Apr 2009 19:03:31 +0200	[thread overview]
Message-ID: <vpq7i1kttss.fsf@bauges.imag.fr> (raw)
In-Reply-To: <7vfxg8k0mk.fsf@gitster.siamese.dyndns.org> (Junio C. Hamano's message of "Thu\, 16 Apr 2009 09\:46\:11 -0700")

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

      reply	other threads:[~2009-04-16 17:08 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-04-16 11:00 how to check what your pulling down? cantona
2009-04-16 11:07 ` Jeff King
2009-04-16 16:46 ` Junio C Hamano
2009-04-16 17:03   ` Matthieu Moy [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=vpq7i1kttss.fsf@bauges.imag.fr \
    --to=matthieu.moy@imag.fr \
    --cc=adam@dwpub.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.