public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Jeff Garzik <jgarzik@pobox.com>
To: Linus Torvalds <torvalds@osdl.org>
Cc: linux-kernel@vger.kernel.org
Subject: Re: git-pull-script on my linus tree fails..
Date: Wed, 22 Jun 2005 01:51:48 -0400	[thread overview]
Message-ID: <42B8FC74.8040306@pobox.com> (raw)
In-Reply-To: <Pine.LNX.4.58.0506211810170.2353@ppc970.osdl.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



      reply	other threads:[~2005-06-22  9:21 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-06-21 12:07 git-pull-script on my linus tree fails Dave Airlie
2005-06-21 15:39 ` Linus Torvalds
2005-06-21 15:56   ` Jeff Garzik
2005-06-21 17:06     ` Linus Torvalds
2005-06-21 17:28       ` Jeff Garzik
2005-06-21 17:42         ` Linus Torvalds
2005-06-21 17:53           ` Jeff Garzik
2005-06-21 18:08             ` Linus Torvalds
2005-06-21 18:17               ` Jeff Garzik
2005-06-21 18:25                 ` Linus Torvalds
2005-06-21 23:52                   ` Jeff Garzik
2005-06-21 23:54                     ` Jeff Garzik
2005-06-22  0:13                       ` Linus Torvalds
2005-06-22  0:46                         ` Jeff Garzik
2005-06-22  1:18                           ` Linus Torvalds
2005-06-22  5:51                             ` Jeff Garzik [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=42B8FC74.8040306@pobox.com \
    --to=jgarzik@pobox.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=torvalds@osdl.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox