From: Michael Witten <mfwitten@gmail.com>
To: rdiezmail-temp2@yahoo.de
Cc: Thomas Rast <trast@student.ethz.ch>,
in-git-vger@baka.org, Michael J Gruber <git@drmicha.warpmail.net>,
Jonathan Nieder <jrnieder@gmail.com>,
Hilco Wijbenga <hilco.wijbenga@gmail.com>,
git@vger.kernel.org
Subject: Re: How to check out the repository at a particular point in time
Date: Tue, 23 Aug 2011 15:54:57 +0000 [thread overview]
Message-ID: <CAMOZ1Bti3ZtAEOtLiUYSkWE+rO_VQd09NAn58Cn4hZBu8f-aFQ@mail.gmail.com> (raw)
In-Reply-To: <1314026326.37332.YahooMailClassic@web25408.mail.ukl.yahoo.com>
On Mon, Aug 22, 2011 at 15:18, R. Diez <rdiezmail-temp2@yahoo.de> wrote:
>> The main problem is that your request is not very
>> well-defined: in
>> nonlinear history there will in general be more than one
>> commit at the
>> time requested.
>>
>> ---a----b----c----M---- (M is a merge)
>> \ /
>> d-----e----f
>>
>> ^----April 1st
>>
>> Suppose you ask git for "the newest commit as of April 1st"
>> in this history. Is it supposed to give you b or d?
>
> I still don't quite understand how git works, but let me
> risk a naive statement here. If "a-b-c-M" were 'master',
> and "d-e-f" were 'new-feature', then on April 1st the
> current version on 'master' is 'b', because I merged the
> 'new-feature' branch at a later point in time. Does that
> make sense?
O! for the love all that is Holy!
You see, guys? The term `branch' was a TERRIBLE choice.
What git calls `branch master' in your example is just a pointer to
the commit object `M'; it has nothing to do with particular lineages
like `a-b-c-M'.
Please see my discussion with Hilco, starting here:
http://marc.info/?l=git&m=131364675708355&w=2
Message-ID: CAMOZ1BsZvXsnnWAPXR7UGKdqOMwuGB-ffaAPk55U_1dcjZUcDw@mail.gmail.com
and this email in particular:
http://marc.info/?l=git&m=131396006222173&w=2
Message-ID: CAMOZ1BvpnP_729YOHrrPW3B8wa5c4cLyD_qAQ5rTuy0JqNiiXg@mail.gmail.com
which also includes the following very germane link:
http://slashdot.org/comments.pl?sid=2350536&cid=36903136
next prev parent reply other threads:[~2011-08-23 15:55 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-22 12:25 How to check out the repository at a particular point in time R. Diez
2011-08-22 13:25 ` Thomas Rast
2011-08-22 15:18 ` R. Diez
2011-08-22 16:56 ` Jens Lehmann
2011-08-23 15:54 ` Michael Witten [this message]
2011-08-23 16:05 ` Jonathan Nieder
2011-08-23 16:09 ` Matthieu Moy
2011-08-23 16:23 ` Michael Witten
2011-08-23 16:53 ` Jonathan Nieder
2011-08-24 15:41 ` Andreas Ericsson
2011-08-24 15:48 ` Randal L. Schwartz
2011-08-24 16:18 ` Michael Witten
-- strict thread matches above, loose matches on Subject: below --
2011-08-23 7:41 R. Diez
2011-08-23 9:17 ` Thomas Rast
2011-08-23 10:04 ` PJ Weisberg
2011-08-23 20:30 ` Jens Lehmann
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=CAMOZ1Bti3ZtAEOtLiUYSkWE+rO_VQd09NAn58Cn4hZBu8f-aFQ@mail.gmail.com \
--to=mfwitten@gmail.com \
--cc=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
--cc=hilco.wijbenga@gmail.com \
--cc=in-git-vger@baka.org \
--cc=jrnieder@gmail.com \
--cc=rdiezmail-temp2@yahoo.de \
--cc=trast@student.ethz.ch \
/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).