Re: [DRAFT] Branching and merging with git

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: <linux@...>
Cc: <git@...>
Date: Friday, November 17, 2006 - 8:40 pm

linux@horizon.com writes:


Yes, and I am actually interested in at least doing the initial
damage assessment myself but people are welcome to beat me to
it.  The easies part would be to just try writing a bare SHA-1
to .git/HEAD with:

	H=$(git-rev-parse --verify HEAD)
        echo $H >.git/HEAD

and see what breaks and start picking up the pieces from there.


git.git itself is full of them, but the very first octopus (it
actually is a pentapus) is rather nice to watch in gitk:

	211232bae64bcc60bbf5d1b5e5b2344c22ed767e

You can look for them with:

	git rev-list --parents HEAD | grep '..* ..* ..* ..* ..* ..*'

Repeat as many " ..*" as the number of parents you would want to require.
I knew the very first one was pentapus (I did it) so I wrote six ..*
there (one for the commit, one each for parents).

Len's dodecapus in linux-2.6.git is this one:

	9fdb62af92c741addbea15545f214a6e89460865

It is very interesting to watch it with "git show".  Len has
another one in August:

	da547d775fa9ba8d9dcaee7bc4e960540e2be576


-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
Re: [DRAFT] Branching and merging with git, Theodore Tso, (Wed Jan 3, 1:04 pm)
Re: [DRAFT] Branching and merging with git, J. Bruce Fields, (Sun Jan 7, 7:44 pm)
Re: [DRAFT] Branching and merging with git, Theodore Tso, (Sun Jan 7, 8:40 pm)
Re: [DRAFT] Branching and merging with git, J. Bruce Fields, (Sun Jan 7, 8:46 pm)
Re: [DRAFT] Branching and merging with git, Guilhem Bonnefille, (Mon Jan 8, 8:38 am)
Re: [DRAFT] Branching and merging with git, J. Bruce Fields, (Tue Jan 9, 12:17 am)
Re: [DRAFT] Branching and merging with git , Horst H. von Brand, (Sun Jan 7, 9:46 pm)
Re: [DRAFT] Branching and merging with git, J. Bruce Fields, (Sun Jan 7, 10:22 pm)
Re: [DRAFT] Branching and merging with git, Junio C Hamano, (Sun Jan 7, 8:24 pm)
Re: [DRAFT] Branching and merging with git, J. Bruce Fields, (Sun Jan 7, 10:35 pm)
Re: [DRAFT] Branching and merging with git, Theodore Tso, (Mon Jan 8, 10:03 am)
Re: [DRAFT] Branching and merging with git, J. Bruce Fields, (Mon Jan 8, 10:41 pm)
Re: [DRAFT] Branching and merging with git, Andreas Ericsson, (Tue Jan 9, 4:46 am)
Re: [DRAFT] Branching and merging with git, Theodore Tso, (Tue Jan 9, 12:58 pm)
Re: [DRAFT] Branching and merging with git, J. Bruce Fields, (Wed Jan 10, 12:15 am)
Re: [DRAFT] Branching and merging with git, J. Bruce Fields, (Tue Jan 9, 11:49 am)
Re: [DRAFT] Branching and merging with git, Junio C Hamano, (Wed Jan 3, 1:08 pm)
Re: [DRAFT] Branching and merging with git, Junio C Hamano, (Thu Jan 4, 2:11 am)
Re: [DRAFT] Branching and merging with git, J. Bruce Fields, (Fri Nov 17, 1:44 pm)
Re: [DRAFT] Branching and merging with git, Theodore Tso, (Fri Nov 17, 11:32 am)
Re: [DRAFT] Branching and merging with git, J. Bruce Fields, (Fri Nov 17, 2:21 pm)
Re: [DRAFT] Branching and merging with git, J. Bruce Fields, (Sun Nov 19, 1:50 pm)
[PATCH] Documentation: add a "git user's manual", J. Bruce Fields, (Sun Nov 26, 12:01 am)
Git manuals, Petr Baudis, (Sun Nov 19, 1:59 pm)
Re: Git manuals, J. Bruce Fields, (Sun Nov 19, 3:36 pm)
Re: [DRAFT] Branching and merging with git, Junio C Hamano, (Fri Nov 17, 8:40 pm)
Re: [DRAFT] Branching and merging with git, Junio C Hamano, (Fri Nov 17, 9:11 pm)
Re: [DRAFT] Branching and merging with git, Junio C Hamano, (Wed Nov 22, 7:51 am)
Re: [DRAFT 2] Branching and merging with git, J. Bruce Fields, (Sun Dec 3, 9:19 pm)
Re: [DRAFT 2] Branching and merging with git, J. Bruce Fields, (Mon Dec 4, 3:23 am)
Re: [DRAFT 2] Branching and merging with git, Johannes Schindelin, (Mon Dec 4, 6:56 am)
Re: [DRAFT] Branching and merging with git, Sean, (Fri Nov 17, 11:57 am)
Re: [DRAFT] Branching and merging with git, Nguyen Thai Ngoc Duy, (Fri Nov 17, 12:19 pm)
Re: [DRAFT] Branching and merging with git, Sean, (Fri Nov 17, 12:34 pm)
Re: [DRAFT] Branching and merging with git, Marko Macek, (Fri Nov 17, 12:25 pm)
Re: [DRAFT] Branching and merging with git, Petr Baudis, (Fri Nov 17, 12:33 pm)
Re: [DRAFT] Branching and merging with git, Junio C Hamano, (Thu Nov 16, 9:09 pm)
Re: [DRAFT] Branching and merging with git, Junio C Hamano, (Fri Nov 17, 1:55 am)
Re: [DRAFT] Branching and merging with git, Junio C Hamano, (Thu Nov 16, 7:47 pm)
Re: [DRAFT] Branching and merging with git, Junio C Hamano, (Thu Nov 16, 9:31 pm)