projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: ccef66b) | patch
git-read-tree: make one-way merge also honor the "update" flag
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Tue, 7 Jun 2005 22:17:33 +0000 (15:17 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Tue, 7 Jun 2005 22:17:33 +0000 (15:17 -0700)
commitb5b425074e5f84f261b1290b1a83eca635c49147
treebaa081569a1a1c671593aeacd8c225998fcff24atree | snapshot
parentccef66b55a6a2eb2c5f6a9dd29a86b181df21af9commit | 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.
read-tree.c diff | blob | history
The core git plumbing