| commit | d723c690637f2918d9861e8d602e592c5fa0bc5b | |
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | |
| Mon, 6 Jun 2005 21:01:58 +0000 (6 14:01 -0700) | ||
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | |
| Mon, 6 Jun 2005 21:01:58 +0000 (6 14:01 -0700) | ||
| tree | 544e7550d7d8ba65e41ce921ec9c6474430d2b02 | treesnapshot (tar.gz zip) |
| parent | 96cd5429a48235fe978ddcb4af56f13e5397cdeb | commitdiff |
git-read-tree: simplify merge loops enormously
Stop trying to haev this stateful thing that keeps track of what it has
seen, and use a much simpler "gather all the different stages with the
same name together and just merge them in one go" approach.
Makes it a lot more understandable, and allows the different merge
algorithms to share the basic merge loop.
Stop trying to haev this stateful thing that keeps track of what it has
seen, and use a much simpler "gather all the different stages with the
same name together and just merge them in one go" approach.
Makes it a lot more understandable, and allows the different merge
algorithms to share the basic merge loop.
| read-tree.c | diffblobblamehistory |