summaryrefslogtreecommitdiff
path: root/init-db.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org.(none)>2005-04-19 18:41:18 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org.(none)>2005-04-19 18:41:18 (GMT)
commita3a65234dba0f90a0b8e06fa7b5f269fe5126761 (patch)
tree7315346f212d77d19f8c7c2fc82c5beda21e4a95 /init-db.c
parentca016f0e4e7e508407fe17e121fcd520fbb7c865 (diff)
downloadgit-a3a65234dba0f90a0b8e06fa7b5f269fe5126761.zip
git-a3a65234dba0f90a0b8e06fa7b5f269fe5126761.tar.gz
git-a3a65234dba0f90a0b8e06fa7b5f269fe5126761.tar.bz2
Make "read-tree" know how to do a "1-way merge".
This one just reads one tree, but picks up any matching stat information from the old index.
Diffstat (limited to 'init-db.c')
0 files changed, 0 insertions, 0 deletions