Junio C Hamano <junkio@xxxxxxx> wrote: > This is a WIP to make "git blame" without any positive rev to > start digging from the working tree copy, which is made into a > fake commit whose sole parent is the HEAD. I hate to be a stick in the mud, but including MERGE_HEAD as parents of the virtual commit would also be nice. Then you can get a blame on conflicted files while in the middle of a merge and are working on sorting the mess out. :-) Yea, MERGE_HEAD is really strictly for git-merge and git-commit, but here its got some use too. -- Shawn. - 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