Junio C Hamano <gitster@xxxxxxxxx> writes: > "Steven E. Harris" <seh@xxxxxxxxx> writes: > >> Was it just luck that "HEAD^" referred to the predecessor that came from >> branch "master" rather than branch "competition"? > > Yes, if you want the second parent you would say HEAD^2. Ahh, I misread your question. No, it is not luck. If you merge competition into your master, the resulting commit will have your master as its first parent. If check out competition and merge master in your example, the resulting merge will have compatition as the first parent. -- 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