From: Linus Torvalds <torvalds@osdl.org>
To: Jeff Garzik <jgarzik@pobox.com>
Cc: Dave Airlie <airlied@linux.ie>, linux-kernel@vger.kernel.org
Subject: Re: git-pull-script on my linus tree fails..
Date: Tue, 21 Jun 2005 10:06:22 -0700 (PDT) [thread overview]
Message-ID: <Pine.LNX.4.58.0506210905560.2268@ppc970.osdl.org> (raw)
In-Reply-To: <42B838BC.8090601@pobox.com>
On Tue, 21 Jun 2005, Jeff Garzik wrote:
>
> Slight tangent... it would be nice if you would write a 2-line
> git-checkout-script, which provides the modern version of
>
> git-read-tree -m HEAD && git-checkout-cache -q -f -u -a
>
> Note that I do depend on this command blowing away working dir changes,
> but maybe you would want that to be a separate arg.
Added. Feel free to try it out, but it's very lightly tested.
You can do just "git checkout" and it will checkout the current HEAD, but
won't overwrite anything old. Use the "-f" flag to force overwrite.
It can also take a new HEAD, ie you can check out the parent of the
current HEAD by doing
git checkout HEAD^
and if you actually want to set the HEAD to that parent you can do so with
the "-u" flag, so
git checkout -u HEAD^
is basically equivalent to "undo the topmost commit".
It's not quite your "switch", though, because it will always _write_ to
the current HEAD, it won't be switching the current HEAD around to another
branch. I almost think that behavkiour would be more useful, I'll think
about how to do it sanely.
Linus
next prev parent reply other threads:[~2005-06-21 17:08 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-06-21 12:07 Dave Airlie
2005-06-21 15:39 ` Linus Torvalds
2005-06-21 15:56 ` Jeff Garzik
2005-06-21 17:06 ` Linus Torvalds [this message]
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
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=Pine.LNX.4.58.0506210905560.2268@ppc970.osdl.org \
--to=torvalds@osdl.org \
--cc=airlied@linux.ie \
--cc=jgarzik@pobox.com \
--cc=linux-kernel@vger.kernel.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
all inboxes | Powered by JetHome®