From: Michael Witten <mfwitten@gmail.com>
To: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Carlos Martín Nieto" <cmn@elego.de>,
vra5107 <venkatram.akkineni@gmail.com>,
git@vger.kernel.org
Subject: Re: [PATCH v2] Docs: git checkout --orphan: `root commit' and `branch head'
Date: Tue, 27 Sep 2011 17:09:58 +0000 [thread overview]
Message-ID: <CAMOZ1BuK1dNdW9gVSnXCwtUBYL7Ef-4-uNNyTMf-wwVCa+0tuw@mail.gmail.com> (raw)
In-Reply-To: <vpq8vpa2agq.fsf@bauges.imag.fr>
On Tue, Sep 27, 2011 at 16:53, Matthieu Moy
<Matthieu.Moy@grenoble-inp.fr> wrote:
> Michael Witten <mfwitten@gmail.com> writes:
>
>> I think that the last paragraph provides enough context to understand
>> its usefulness.
>
> The last paragraph tells the user how to commit something different from
> what is already here, which is pretty much the opposite.
>
> IOW, I see two uses for --orphan:
>
> 1) Publish the same tree without its history
>
> 2) Start a different project, but for some reason you wanted it to leave
> in the same repository and you didn't want a "git init".
>
> The next paragraph documents 2), but your removed paragraph was
> documenting 1). Reading the new version, it feels like the user is
> encourraged to modify the index, while it's just an option.
Those 2 uses are not really different; both are manifestations of
creating a new root commit using some tree.
The way I see it, people would think:
1. I've got to get rid of this proprietary stuff
before I publish as open source.
2. I'll need a new root commit for the open source
stuff, too, otherwise it'll still be accessible.
3a. Aha! I can create a root commit based on the
proprietary stuff, but altered in any way that
I need.
3b. Aha! I've already got a cleaned commit, I can
just use that as the basis for the root commit
without further alteration.
In any case, removing history is probably better handled by
filter-branch or rebase, as I bet more often than not there are
existing descendants of the proposed root commit that need to be
played back anyway.
next prev parent reply other threads:[~2011-09-27 17:10 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-25 14:15 Can a git changeset be created with no parent vra5107
2011-09-25 14:33 ` Andreas Ericsson
2011-09-25 14:33 ` Carlos Martín Nieto
2011-09-26 19:25 ` Junio C Hamano
2011-09-26 21:41 ` Carlos Martín Nieto
2011-09-27 14:43 ` [PATCH] Docs: git checkout --orphan: `root commit' and `branch head' Michael Witten
2011-09-27 15:02 ` Matthieu Moy
2011-09-27 15:46 ` [PATCH v2] " Michael Witten
2011-09-27 16:01 ` Matthieu Moy
2011-09-27 16:13 ` Michael Witten
2011-09-27 16:53 ` Matthieu Moy
2011-09-27 17:09 ` Michael Witten [this message]
2011-09-27 20:59 ` Philip Oakley
2011-09-28 16:23 ` [PATCH v3] " Michael Witten
2011-09-28 20:34 ` Junio C Hamano
2011-09-29 15:52 ` Michael Witten
2011-09-29 15:44 ` [PATCH v4] Docs: git checkout --orphan: Copyedit, and s/root commit/orphan branch/ Michael Witten
2011-09-29 16:44 ` Michael Witten
2011-09-29 20:05 ` Philip Oakley
2011-09-29 18:11 ` In favor of "git commit --no-parent" Junio C Hamano
2011-09-29 18:52 ` Michael Witten
2011-09-29 18:59 ` [PATCH] Documentation/git-checkout.txt: Explain --orphan without introducing an undefined "orphan branch" Junio C Hamano
2011-09-29 19:02 ` Michael Witten
2011-09-29 21:02 ` In favor of "git commit --no-parent" Phil Hord
2011-09-29 21:28 ` Michael Witten
2011-09-29 21:50 ` Phil Hord
2011-09-29 22:01 ` Michael Witten
[not found] ` <CABURp0q8YhTS-GDYOANEa19P-V2wf_EUTo=RHqnhDB619w=y-w@mail.gmail.com>
[not found] ` <7vd3ejrqin.fsf@alter.siamese.dyndns.org>
2011-09-29 21:54 ` Junio C Hamano
2011-09-29 22:07 ` Phil Hord
2011-09-29 22:29 ` Michael Witten
2011-09-29 22:32 ` Michael Witten
2011-09-29 23:08 ` Junio C Hamano
2011-09-30 0:51 ` Michael Witten
2011-09-30 2:28 ` Junio C Hamano
2011-09-29 22:07 ` Michael Witten
2011-09-27 15:49 ` [PATCH] Docs: git checkout --orphan: `root commit' and `branch head' Michael J Gruber
2011-09-27 16:02 ` Michael Witten
2011-09-27 17:25 ` Junio C Hamano
2011-09-27 17:50 ` Michael Witten
2011-09-27 20:34 ` Eric Raible
2011-09-27 21:31 ` Philip Oakley
2011-09-27 21:42 ` Jeff King
2011-09-27 23:28 ` Michael Witten
2011-09-27 23:35 ` Jeff King
2011-09-27 23:44 ` Michael Witten
2011-09-28 0:32 ` Junio C Hamano
2011-09-28 13:40 ` Michael Witten
2011-09-28 13:45 ` Matthieu Moy
2011-09-28 13:50 ` Michael Witten
2011-09-28 14:09 ` Matthieu Moy
2011-09-28 14:35 ` Michael Witten
2011-09-28 14:45 ` Matthieu Moy
2011-09-28 15:06 ` Michael Witten
2011-09-28 18:17 ` Junio C Hamano
2011-09-28 4:04 ` Jay Soffian
2011-09-28 4:37 ` Michael Witten
2011-09-28 8:00 ` Michael J Gruber
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=CAMOZ1BuK1dNdW9gVSnXCwtUBYL7Ef-4-uNNyTMf-wwVCa+0tuw@mail.gmail.com \
--to=mfwitten@gmail.com \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=cmn@elego.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=venkatram.akkineni@gmail.com \
/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;
as well as URLs for NNTP newsgroup(s).