![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from: 4b3ffe5)
raw | patch | inline | side by side (from: 4b3ffe5)
| author | Jeff King <peff@peff.net> | |
| Fri, 25 Mar 2011 18:13:31 +0000 (14:13 -0400) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 25 Mar 2011 21:16:27 +0000 (14:16 -0700) |
For a pull into an unborn branch, we do not use "git merge"
at all. Instead, we call read-tree directly. However, we
used the --reset parameter instead of "-m", which turns off
the safety features.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
at all. Instead, we call read-tree directly. However, we
used the --reset parameter instead of "-m", which turns off
the safety features.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
No differences found