author | Linus Torvalds <torvalds@ppc970.osdl.org> | |
Sat, 16 Apr 2005 04:45:38 +0000 (21:45 -0700) | ||
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | |
Sat, 16 Apr 2005 04:45:38 +0000 (21:45 -0700) | ||
commit | f5cabd13d814bb5c547a13af03bcc42122531141 | |
tree | 6795adc096e36c7a7f8e6a407297727e61d4d083 | tree | snapshot |
parent | 13e897e58072678cdae3ec1db51cc91110dc559d | commit | diff |
Encode a few extra flags per index entry.
This will allow us to have the same name in different "states" in the
index at the same time. Which in turn seems to be a very simple way to
merge.
This will allow us to have the same name in different "states" in the
index at the same time. Which in turn seems to be a very simple way to
merge.
cache.h | diff | blob | history | |
read-tree.c | diff | blob | history | |
update-cache.c | diff | blob | history |