From: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
To: Jonathan Nieder <jrnieder@gmail.com>
Cc: Michael Witten <mfwitten@gmail.com>,
rdiezmail-temp2@yahoo.de, Thomas Rast <trast@student.ethz.ch>,
in-git-vger@baka.org, Michael J Gruber <git@drmicha.warpmail.net>,
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 18:09:25 +0200 [thread overview]
Message-ID: <vpqliuk85ze.fsf@bauges.imag.fr> (raw)
In-Reply-To: <20110823160525.GB3545@elie.gateway.2wire.net> (Jonathan Nieder's message of "Tue, 23 Aug 2011 11:05:25 -0500")
Jonathan Nieder <jrnieder@gmail.com> writes:
> Michael Witten wrote:
>> On Mon, Aug 22, 2011 at 15:18, R. Diez <rdiezmail-temp2@yahoo.de> wrote:
>
>>> 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!
>
> Wait, what's wrong with what R. Diez said? It's exactly what
> --first-parent gives you.
Not really. Suppose, on April 1st, I have
A--B--C <-master
\
D--E <-new-feature
Then, I merge from upstream
A--B-----C <-master
\ \
D--E--F <-new-feature
and then I push to master, or master fast-forward-pulls from me:
A--B-----C
\ \
D--E--F <-new-feature, master
Then, what used to be in master on April 1st is C, but --first-parent
will give you E instead.
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
next prev parent reply other threads:[~2011-08-23 16:09 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
2011-08-23 16:05 ` Jonathan Nieder
2011-08-23 16:09 ` Matthieu Moy [this message]
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=vpqliuk85ze.fsf@bauges.imag.fr \
--to=matthieu.moy@grenoble-inp.fr \
--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=mfwitten@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).