![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | |
| Tue, 7 Jun 2005 22:17:33 +0000 (15:17 -0700) | ||
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | |
| Tue, 7 Jun 2005 22:17:33 +0000 (15:17 -0700) | ||
| commit | b5b425074e5f84f261b1290b1a83eca635c49147 | |
| tree | baa081569a1a1c671593aeacd8c225998fcff24a | tree | snapshot |
| parent | ccef66b55a6a2eb2c5f6a9dd29a86b181df21af9 | commit | diff |
git-read-tree: make one-way merge also honor the "update" flag
It didn't set CE_UPDATE before, so "-u" was a no-op.
It didn't set CE_UPDATE before, so "-u" was a no-op.
| read-tree.c | diff | blob | history |