From: Michael Haggerty <mhagger@alum.mit.edu>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jeff King <peff@peff.net>,
Andrew Ardill <andrew.ardill@gmail.com>,
git@vger.kernel.org
Subject: Re: Bug: "git checkout -b" should be allowed in empty repo
Date: Tue, 07 Feb 2012 09:04:11 +0100 [thread overview]
Message-ID: <4F30DAFB.5050906@alum.mit.edu> (raw)
In-Reply-To: <7vpqdr7rn0.fsf@alter.siamese.dyndns.org>
On 02/06/2012 07:17 PM, Junio C Hamano wrote:
> Jeff King <peff@peff.net> writes:
> Probably I am slower than my usual slow self this morning. Does Michael's
> approach go like this:
>
> git init project
> cd project
> import import import
> git branch -m vendor
> git checkout -b master
>
> to fork from third-party codebase?
I'm not really forking the third-party code; I'm just importing a
snapshot to a particular subdirectory of my own project. I wanted to do
something like:
git init project
cd project
git checkout -b vendor
import import import commit (into subdirectory "foo")
git checkout --orphan master
git clean -fxd
hack commit hack commit
# Then when the vendor stuff is logically needed in master:
git merge vendor
With the option to import later snapshots of the third-party code to the
"vendor" branch then re-merge it to master.
> Care to come up with a patch to Documentation/git-checkout.txt? The
> description there strongly implies that <start point> is an existing
> commit. Not much is said about what the lack of <start point> mean when
> it describes "checkout -b", and a standalone description of <start point>
> says "The name of a comit at which to start... Defaults to HEAD". These
> need to be loosened and described in terms of the closer-to-the-user "at
> my current state".
I'll work on it as soon as I have time.
Michael
--
Michael Haggerty
mhagger@alum.mit.edu
http://softwareswirl.blogspot.com/
next prev parent reply other threads:[~2012-02-07 8:04 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-29 6:09 Bug: "git checkout -b" should be allowed in empty repo Michael Haggerty
2012-01-29 6:56 ` Junio C Hamano
2012-01-29 7:50 ` Junio C Hamano
2012-01-30 6:38 ` Michael Haggerty
2012-01-30 18:48 ` Junio C Hamano
2012-01-30 20:10 ` Junio C Hamano
2012-01-30 21:50 ` Jeff King
2012-02-06 2:06 ` Junio C Hamano
2012-02-06 2:08 ` Junio C Hamano
2012-02-06 4:30 ` Jeff King
2012-02-06 4:42 ` Andrew Ardill
2012-02-06 5:06 ` Jeff King
2012-02-06 8:51 ` Michael Haggerty
2012-02-06 8:57 ` Jeff King
2012-02-06 18:17 ` Junio C Hamano
2012-02-06 20:14 ` Jeff King
2012-02-07 8:04 ` Michael Haggerty [this message]
2012-02-06 18:39 ` demerphq
2012-02-06 5:15 ` Junio C Hamano
2012-02-06 5:18 ` Jeff King
2012-02-06 5:30 ` Junio C Hamano
2012-02-06 5:34 ` Junio C Hamano
2012-02-06 5:45 ` Jeff King
2012-02-06 8:59 ` Michael Haggerty
2012-02-06 18:31 ` Junio C Hamano
2012-01-30 21:48 ` Jeff King
2012-02-06 1:26 ` [PATCH] branch --edit-description: protect against mistyped branch name Junio C Hamano
2012-02-06 1:27 ` Junio C Hamano
2012-02-06 4:20 ` Jeff King
2012-01-31 8:57 ` Bug: "git checkout -b" should be allowed in empty repo Michael Haggerty
2012-01-31 10:01 ` Johannes Sixt
2012-01-31 10:11 ` demerphq
2012-01-31 10:09 ` Jakub Narebski
2012-01-31 16:32 ` Michael Haggerty
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=4F30DAFB.5050906@alum.mit.edu \
--to=mhagger@alum.mit.edu \
--cc=andrew.ardill@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.