From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 25151 invoked by alias); 13 Nov 2014 20:01:50 -0000 Mailing-List: contact zsh-users-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Users List List-Post: List-Help: X-Seq: 19380 Received: (qmail 6330 invoked from network); 13 Nov 2014 20:01:47 -0000 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.2 X-Originating-IP: [80.3.229.105] X-Spam: 0 X-Authority: v=2.1 cv=N7qnFgNB c=1 sm=1 tr=0 a=uz1KDxDNIq33yePw376BBA==:117 a=uz1KDxDNIq33yePw376BBA==:17 a=NLZqzBF-AAAA:8 a=kj9zAlcOel0A:10 a=anyJmfQTAAAA:8 a=vAHNE-2sgagpDndIIkUA:9 a=CjuIK1q_8ugA:10 Date: Thu, 13 Nov 2014 20:01:44 +0000 From: Peter Stephenson To: Zsh Users Subject: Re: git along Message-ID: <20141113200144.7510d6a8@pws-pc.ntlworld.com> In-Reply-To: <546501D1.3050608@eastlink.ca> References: <546501D1.3050608@eastlink.ca> X-Mailer: Claws Mail 3.8.0 (GTK+ 2.24.7; x86_64-redhat-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit On Thu, 13 Nov 2014 11:09:05 -0800 Ray Andrews wrote: > The 'git' manual being longer than War and Peace, let me ask > some simple questions: > > git clone git:where-its-coming-from where-its-going-to > > ... simple. If I rerun it with the same target dir, will it just > update, or will it do the full monty all over again? Would any > files I've added be preserved, or nuked? Just change into where-its-going-to and git pull or if you're liable to have made changes to the repository yourself since you last updated git pull --rebase which puts your changes together with the remote ones together in a neater fashion. > Can we: > > git just-show-me-whats-changed ... ? > > ... or is life just not meant to be so painless? Do you mean what you just imported in the last pull? git log ORIG_HEAD.. Add the option -p if you want to see changes within files as a patch. (As you're about to see, any sufficiently complicated git post instantly has half a dozen git experts falling over themselves to point out the error of your ways.) > Is there a recommended beginner's guide to git? http://git-scm.com/book/en/v2 pws