From mboxrd@z Thu Jan 1 00:00:00 1970 From: cantona Subject: how to check what your pulling down? Date: Thu, 16 Apr 2009 04:00:08 -0700 (PDT) Message-ID: <23075475.post@talk.nabble.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Thu Apr 16 13:01:48 2009 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1LuPLm-00074E-GQ for gcvg-git-2@gmane.org; Thu, 16 Apr 2009 13:01:46 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754472AbZDPLAO (ORCPT ); Thu, 16 Apr 2009 07:00:14 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753843AbZDPLAM (ORCPT ); Thu, 16 Apr 2009 07:00:12 -0400 Received: from kuber.nabble.com ([216.139.236.158]:33070 "EHLO kuber.nabble.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753922AbZDPLAL (ORCPT ); Thu, 16 Apr 2009 07:00:11 -0400 Received: from isper.nabble.com ([192.168.236.156]) by kuber.nabble.com with esmtp (Exim 4.63) (envelope-from ) id 1LuPKC-00089D-QO for git@vger.kernel.org; Thu, 16 Apr 2009 04:00:08 -0700 X-Nabble-From: adam@dwpub.com Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: 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.