"Joachim Schmitz" writes:
>> I think it is the-merge-commit^2; contrib/git-resurrect.sh might be
>> of interest, too.
>
> Sorry you lost me, this is greek to me...
A commit is an object that contain pointers to its parents. The root
commit has no parent. For ordinary commits, there is one parent
> From: Junio C Hamano [mailto:gits...@pobox.com]
> Sent: Tuesday, September 11, 2012 6:06 PM
> To: Matthieu Moy
> Cc: Joachim Schmitz; git
> Subject: Re: How to update a cloned git repository
>
> Matthieu Moy writes:
>
> > [ Re-adding git@vger in Cc,
> -Original Message-
> From: Junio C Hamano [mailto:gits...@pobox.com]
> Sent: Tuesday, September 11, 2012 6:01 PM
> To: Joachim Schmitz
> Cc: 'Matthieu Moy'; git@vger.kernel.org
> Subject: Re: How to update a cloned git repository
>
> "Joachim S
Junio C Hamano writes:
> Matthieu Moy writes:
>
>> Anyway, you can easily get it from the commit that merges the branch
>> (it's the-merge-commit^1).
>
> I think it is the-merge-commit^2;
Right. I forgot that Git counted parents from 1, not 0.
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
Matthieu Moy writes:
> [ Re-adding git@vger in Cc, I guess it was meant to be so ]
>
> "Joachim Schmitz" writes:
>
>>> Then, work on the tip of the topic branch you depend on instead of pu.
>>> These are more stable, as they will be rewritten only if this particular
>>> topic branch changes.
>>
"Joachim Schmitz" writes:
>> From: Matthieu Moy [mailto:matthieu@grenoble-inp.fr]
>> ..
>> Short answer: don't work on pu. Work on master unless you have a good
>> reason not to.
>
> There are some changes in pu, that I need as the basis, namely my
> setitimer patch and my 2nd mkdir patch, wh
On Tue, Sep 11, 2012 at 4:47 PM, Joachim Schmitz
wrote:
> Like this?
> git pull --rebase HEAD~42
>
> So far I create patches, wiped out the entire repository, cloned, forked and
> applied the changes, pretty painful.
I think a 'git pull --rebase' should usually work even for 'pu'.
But sometime
On Tue, Sep 11, 2012 at 2:40 PM, Matthieu Moy
wrote:
> [ Re-adding git@vger in Cc, I guess it was meant to be so ]
>
> "Joachim Schmitz" writes:
>
>>> Then, work on the tip of the topic branch you depend on instead of pu.
>>> These are more stable, as they will be rewritten only if this particula
> From: Matthieu Moy [mailto:matthieu@grenoble-inp.fr]
> Sent: Tuesday, September 11, 2012 2:41 PM
> To: Joachim Schmitz
> Cc: git
> Subject: Re: How to update a cloned git repository
>
> [ Re-adding git@vger in Cc, I guess it was meant to be so ]
Oops, yes it was
[ Re-adding git@vger in Cc, I guess it was meant to be so ]
"Joachim Schmitz" writes:
>> Then, work on the tip of the topic branch you depend on instead of pu.
>> These are more stable, as they will be rewritten only if this particular
>> topic branch changes.
>
> These are not available from gi
"Joachim Schmitz" writes:
>> From: Matthieu Moy [mailto:matthieu@grenoble-inp.fr]
>>
>> Short answer: don't work on pu. Work on master unless you have a good
>> reason not to.
>
> There are some changes in pu, that I need as the basis, namely my
> setitimer patch and my 2nd mkdir patch, which
> From: Matthieu Moy [mailto:matthieu@grenoble-inp.fr]
> Sent: Tuesday, September 11, 2012 1:06 PM
> To: Joachim Schmitz
> Cc: git@vger.kernel.org
> Subject: Re: How to update a cloned git repository
>
> "Joachim Schmitz" writes:
>
> > Hi folk
"Joachim Schmitz" writes:
> Hi folks
>
> Probably a beginner's question...
>
> If I did a
>git clone git://guthub.com/git/git.git
> and worked on some own branches of pu
>git checkout pu;git checkout -p mybranch;
I guess you meant "git checkout -b mybranch" (not -p).
> hack;hack;...;git
Hi folks
Probably a beginner's question...
If I did a
git clone git://guthub.com/git/git.git
and worked on some own branches of pu
git checkout pu;git checkout -p mybranch;hack;hack;...;git commit -a -s
how to update my repository once the the one on github changed?
A plain
git pull
or
14 matches
Mail list logo
