From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S262814AbVFVJV6 (ORCPT ); Wed, 22 Jun 2005 05:21:58 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S262868AbVFVHoV (ORCPT ); Wed, 22 Jun 2005 03:44:21 -0400 Received: from mail.dvmed.net ([216.237.124.58]:21675 "EHLO mail.dvmed.net") by vger.kernel.org with ESMTP id S262833AbVFVFvw (ORCPT ); Wed, 22 Jun 2005 01:51:52 -0400 Message-ID: <42B8FC74.8040306@pobox.com> Date: Wed, 22 Jun 2005 01:51:48 -0400 From: Jeff Garzik User-Agent: Mozilla Thunderbird 1.0.2-6 (X11/20050513) X-Accept-Language: en-us, en MIME-Version: 1.0 To: Linus Torvalds CC: linux-kernel@vger.kernel.org Subject: Re: git-pull-script on my linus tree fails.. References: <42B838BC.8090601@pobox.com> <42B84E20.7010100@pobox.com> <42B8542A.9020700@pobox.com> <42B859B4.5060209@pobox.com> <42B8A82E.4020207@pobox.com> <42B8A8CA.9040804@pobox.com> <42B8B4C8.70704@pobox.com> In-Reply-To: Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: 0.0 (/) Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Linus Torvalds wrote: > And hey, if you don't like the feature, you can always just use the "-f" > flag, which will act the way your old script did, and always just throw > any pending changes away when you check out a new branch. hehe, that's what I am doing ;-) For fast-forward merges, I use "git checkout". For everything else in my workflow, I use "git checkout -f $branch" I'm not sure that I, personally, will ever use "git checkout $branch" without "-f". Jeff