From: | Dirkjan Ochtman <djc@g.o> | ||
---|---|---|---|
To: | gentoo-dev@l.g.o | ||
Subject: | Re: [gentoo-dev] Git braindump: 1 of N: merging & git signing | ||
Date: | Mon, 04 Jun 2012 13:50:16 | ||
Message-Id: | CAKmKYaBD0yiq7HRrZ+XcOQ-9=GSiBmcLYEDCS3_oH6=kpzP+yA@mail.gmail.com | ||
In Reply to: | Re: [gentoo-dev] Git braindump: 1 of N: merging & git signing by Rich Freeman |
1 | On Mon, Jun 4, 2012 at 3:40 PM, Rich Freeman <rich0@g.o> wrote: |
2 | > The only thing the merge commit contains is a list of two parents, and |
3 | > a tree. It doesn't say which one is which, unless we can rely on |
4 | > their order. |
5 | |
6 | You simply walk the tree from root to tip. When you encounter an |
7 | unsigned changeset, the nearest signed descendant is responsible for |
8 | merging that changeset. |
9 | |
10 | Cheers, |
11 | |
12 | Dirkjan |
Subject | Author |
---|---|
Re: [gentoo-dev] Git braindump: 1 of N: merging & git signing | Rich Freeman <rich0@g.o> |