Pieter de Bie <pdebie@xxxxxxxxx> writes: > According to the git-fast-import man-page, you can only put a single > committish per merge: line, like this: > > merge :10 > merge :11 > > However, git-fast-export puts all parents on a single line, like this: > > merge :10 :11 > > This may be fine with git-fast-import,... Is it fine for even git-fast-import? fast-import.c: parse_merge() seems to suggest that it also wants one parent per "merge " line. -- 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
