diff options
| author | Jeff King <peff@peff.net> | 2011-03-25 21:13:31 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-04-03 23:35:39 +0400 |
| commit | 8c8674fc954d8c4bc46f303a141f510ecf264fcd (patch) | |
| tree | 7051d86def82068ed533d8d8209289e91aaed9d4 /Documentation/RelNotes/1.7.4.4.txt | |
| parent | 44ec754dc766e38684d9ad4563019378730eea82 (diff) | |
pull: do not clobber untracked files on initial pull
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>
Diffstat (limited to 'Documentation/RelNotes/1.7.4.4.txt')
0 files changed, 0 insertions, 0 deletions