diff options
| author | Linus Torvalds <torvalds@osdl.org> | 2006-05-15 15:09:31 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-15 19:23:04 (GMT) |
| commit | 6d6776cb497ea7fbf5fe43912dbe3286f76c9933 (patch) | |
| tree | 82473f408ae914feac348256557b44e523e1d67e /blob.h | |
| parent | 613f02739a49337592a32936caa04b1590ca1109 (diff) | |
| download | git-6d6776cb497ea7fbf5fe43912dbe3286f76c9933.zip git-6d6776cb497ea7fbf5fe43912dbe3286f76c9933.tar.gz git-6d6776cb497ea7fbf5fe43912dbe3286f76c9933.tar.bz2 | |
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>
Diffstat (limited to 'blob.h')
0 files changed, 0 insertions, 0 deletions