projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from: ca016f0)
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)
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.


No differences found
The core git plumbing