projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: ca016f0) | patch
Make "read-tree" know how to do a "1-way merge".
authorLinus Torvalds <torvalds@ppc970.osdl.org.(none)>
Tue, 19 Apr 2005 18:41:18 +0000 (11:41 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org.(none)>
Tue, 19 Apr 2005 18:41:18 +0000 (11:41 -0700)
commita3a65234dba0f90a0b8e06fa7b5f269fe5126761
tree7315346f212d77d19f8c7c2fc82c5beda21e4a95tree | snapshot
parentca016f0e4e7e508407fe17e121fcd520fbb7c865commit | diff
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.
read-tree.c diff | blob | history
The core git plumbing