| commit | 6d6776cb497ea7fbf5fe43912dbe3286f76c9933 | |
| author | Linus Torvalds <torvalds@osdl.org> | |
| Mon, 15 May 2006 15:09:31 +0000 (15 08:09 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Mon, 15 May 2006 19:23:04 +0000 (15 12:23 -0700) | ||
| tree | 82473f408ae914feac348256557b44e523e1d67e | treesnapshot (tar.gz zip) |
| parent | 613f02739a49337592a32936caa04b1590ca1109 | commitdiff |
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>
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>
| read-tree.c | diffblobblamehistory |