]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 95fd5bf) | patch
Make "read-tree" merge the trees it reads by giving them consecutive states.
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Sat, 16 Apr 2005 05:53:45 +0000 (22:53 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Sat, 16 Apr 2005 05:53:45 +0000 (22:53 -0700)
commitd99082e0e3436f5fcf259aa1a4189473f6bb5ce3
tree8156e162365f85a1712373132bd8bb3ba0209537tree | snapshot
parent95fd5bf82ae28da47dcbf8e6e4570e64d71dc532commit | diff
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.
read-tree.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.