git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: how to check what your pulling down?

From
Jeff King <peff@peff.net>
Date
Apr 16, 2009, 11:07 UTC
Message-ID
<20090416110707.GA31915@coredump.intra.peff.net>
In-Reply-To
<23075475.post@talk.nabble.com>
On Thu, Apr 16, 2009 at 04:00:08AM -0700, cantona wrote:
> My question: before I pull down I always get that bad feeling... "what am i
> gunna get? will there be a conflict?". Is there a git command to check what
> will come down with the next pull? If not, a command that will tell you
> which local files differ from the git repository files?
Pull is just fetch+merge, so you can do:
  $ git fetch $remote
  $ git log ..$remote/$branch

to see how they differ from you. And then "git merge $remote/$branch" if you like it.

-Peff
Previous: cantonaNext: Junio C Hamano
Message 2 of 4 in “how to check what your pulling down?”
  1. cantonaApr 16, 2009
  2. Jeff KingApr 16, 2009
  3. Junio C HamanoApr 16, 2009
  4. Matthieu MoyApr 16, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.