From: Linus Torvalds <torvalds@osdl.org>
Date: Mon, 15 May 2006 15:09:31 +0000 (-0700)
Subject: read-tree --reset -u fix.
X-Git-Tag: v1.4.1-rc1~106^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6d6776cb497ea7fbf5fe43912dbe3286f76c9933?hp=6d6776cb497ea7fbf5fe43912dbe3286f76c9933

read-tree --reset -u fix.

The previous commit makes -u to mean "I do want to remove the
local changes, just update it from the read tree" only for
one-way merge.  It makes sense to have it depend on the
"--reset" flag instead.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---