Linus Torvalds <torvalds@xxxxxxxx> writes: > And the problem seems to go to the "root commit": if the file existed in > the root, the logic in "git blame" to diff against the (nonexistent) > parent of the root commit won't do the right thing, and that just confuses > git blame entirely. > > I think Junio screwed up at some point. I'll send him a bug-report once > I've triaged this a bit more, but I can recreate your breakage if I start > a new git database and create two files in the root, and move data between > them in the second commit (but if I instead create the second file in the > second commit, and do the movement in the third commit, git blame -C works > again ;). Is it safe to assume that the "automatically turning --show-name on" fixes this issue and it does not have anything to do with the root commit? Given the way the "passing the blame" algorithm works, there should not be anything special about the root commit --- if some blame remains in a commit:path pair, and if the commit does not have parents, it takes the blame right away without needing to run any diff. > In fact, I'm pretty hardcore, and I don't think I've ever really used > "--soft". It's largely been replaced by "git commit --amend", because > amending a commit used to be the only reason to use "--soft", really. > So it might even be worthwhile just dropping "--soft" and "--mixed" > altogether, but in the meantime, you might as well just ignore them. Everything in the above paragraph is correct. >> git pull seems to do many things which I would need to use bzr merge >> for---I can "pull" between branches which have diverged, for example. >> I don't understand quite what git merge does that's different, and when >> to use one or the other. > > Heh. I'm with you. I'm in the "don't use 'git merge' at all" camp, but it > was argued that people coming from non-git backgrounds would find it > too confusing to just use "git pull" for merging ;) Interesting. I had exactly the same response as yours when I read Joseph's message ;-). - 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