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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html