projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 4aaef10) | patch
Make "read-tree" take the 'stat' information for a merge result from the
authorLinus Torvalds <torvalds@ppc970.osdl.org.(none)>
Tue, 19 Apr 2005 18:16:12 +0000 (11:16 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org.(none)>
Tue, 19 Apr 2005 18:16:12 +0000 (11:16 -0700)
commitca016f0e4e7e508407fe17e121fcd520fbb7c865
treec5404b84a8df1badc32da2ba364f0485f4258e61tree | snapshot
parent4aaef1064a1091ec38ab6adc823f26b82cf4998dcommit | diff
Make "read-tree" take the 'stat' information for a merge result from the
old index state if the result matches.

This leaves the stat information in the result tree for any trivial
merges, which is just the way we like it.
read-tree.c diff | blob | history
The core git plumbing