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

Re: Is there a way to cherry-pick a merge?

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:57:45

"George Spelvin" [off-list ref] writes:
Sometimes I'd like to repeat a previously performed merge, preserving
the commit message.  And, if possible, the conflict resolutions.
Is it "git merge commit^2"?
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help