diff options
| author | Clemens Buchacher <drizzd@aon.at> | 2010-11-14 22:07:49 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-15 17:27:33 (GMT) |
| commit | 172b6428d06ff4eb0812f087a497d50b6c878fe1 (patch) | |
| tree | 0d5dd95e7f771f95692673b0a6d5d853ecae48a5 /wt-status.h | |
| parent | 2caf20c52b7f646d0a7481c25415c48d687773b2 (diff) | |
| download | git-172b6428d06ff4eb0812f087a497d50b6c878fe1.zip git-172b6428d06ff4eb0812f087a497d50b6c878fe1.tar.gz git-172b6428d06ff4eb0812f087a497d50b6c878fe1.tar.bz2 | |
do not overwrite untracked during merge from unborn branch
In case HEAD does not point to a valid commit yet, merge is
implemented as a hard reset. This will cause untracked files to be
overwritten.
Instead, assume the empty tree for HEAD and do a regular merge. An
untracked file will cause the merge to abort and do nothing. If no
conflicting files are present, the merge will have the same effect
as a hard reset.
Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'wt-status.h')
0 files changed, 0 insertions, 0 deletions