Re: How to update a cloned git repository

[Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>]

"Joachim Schmitz" <jojo@schmitz-digital.de> 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 which is
the commit on top of which it was created. For merge commits, there are
N commits, the first is the one on top of which the merge was created,
and the N-1 next ones are the commits being merged.

commit^ => first parent of commit
commit^1 => same
commit^2 => second parent, i.e. the one merged in commit.

See in git.git:

$ git show cb10ae9433126ef <---------------------------- one commit to study
commit cb10ae9433126efbc4dcc46779d7ef2fe6b1f597
Merge: 13b608a 9aeaab6   <------------------------------- list of parents
Author: Junio C Hamano <gitster@pobox.com>
Date:   Tue Sep 11 15:57:04 2012 -0700

    Merge branch 'jc/maint-blame-no-such-path' into pu
    
    * jc/maint-blame-no-such-path:
      blame: allow "blame file" in the middle of a conflicted merge

$ git show cb10ae9433126ef^1 <-------------------- "previous commit" in origin/pu
commit 13b608a063ce861929322e6bb3862b5364f3fbcf
Merge: fa17a26 bdee397
Author: Junio C Hamano <gitster@pobox.com>
Date:   Tue Sep 11 11:50:44 2012 -0700

    Merge branch 'dg/run-command-child-cleanup' into pu
    
    * dg/run-command-child-cleanup:
      run-command.c: fix broken list iteration in clear_child_for_cleanup

$ git show cb10ae9433126ef^2 <----------------- commit being merged by cb10ae9433126ef
commit 9aeaab6811dce596b4f6141d76f5300359bfd009
Author: Junio C Hamano <gitster@pobox.com>
Date:   Tue Sep 11 14:30:03 2012 -0700

    blame: allow "blame file" in the middle of a conflicted merge
[...]

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/