Thomas Rast <trast@xxxxxxxxxxx> writes: > The logic for pulling into an unborn branch was originally designed to > be used on a newly-initialized repository (d09e79c, git-pull: allow > pulling into an empty repository, 2006-11-16). It thus did not > initially deal with uncommitted changes in the unborn branch. The > case of an _unstaged_ untracked file was fixed by 4b3ffe5 (pull: do > not clobber untracked files on initial pull, 2011-03-25). However, it > still clobbered existing staged files, both when the file exists in > the merged commit (it will be overwritten), and when it does not (it > will be deleted). Perhaps making sure the index is empty is sufficient, then? -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html