diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-15 22:53:45 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-15 22:53:45 -0700 |
| commit | d99082e0e3436f5fcf259aa1a4189473f6bb5ce3 (patch) | |
| tree | 8156e162365f85a1712373132bd8bb3ba0209537 /commit.c | |
| parent | 95fd5bf82ae28da47dcbf8e6e4570e64d71dc532 (diff) | |
| download | git-d99082e0e3436f5fcf259aa1a4189473f6bb5ce3.tar.gz | |
Make "read-tree" merge the trees it reads by giving them consecutive states.
Normally you'd use state 0 for the "merged" state, and start out with
state 1 being "origin", state 2 being "first tree" and state 3 being
"second tree".
Once all the index entries are back in state 0, we have a successful
merge and can write the result tree back.
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions