Thread (3 messages) flat view 3 messages, 3 authors, 2016-06-15

Re: How does git follow branch history across a merge commit?

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:47:20

Junio C Hamano [off-list ref] writes:
"Steven E. Harris" [off-list ref] writes:
quoted
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.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help