Hi 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?". 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? Thanks -- View this message in context: http://www.nabble.com/how-to-check-what-your-pulling-down--tp23075475p23075475.html Sent from the git mailing list archive at Nabble.com. -- 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