{"thread":{"id":"34146","subject":"Is there a way to cherry-pick a merge?","startedAt":"2013-06-14T19:37:29Z","lastAt":"2013-06-15T03:03:27Z","messageCount":5,"participants":["George Spelvin","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"220908","messageId":"20130614193729.17663.qmail@science.horizon.com","threadId":"34146","inReplyTo":null,"subject":"Is there a way to cherry-pick a merge?","fromName":"George Spelvin","fromEmail":"linux@horizon.com","sentAt":"2013-06-14T19:37:29Z","receivedAt":"2013-06-14T19:37:29Z","isPatch":false,"sender":{"key":"linux@horizon.com","avatar":null},"body":"Sometimes I'd like to repeat a previously performed merge, preserving\nthe commit message. And, if possible, the conflict resolutions.\n\n\"git cherry-pick -m 1 \" gets me the changes, but makes an\nordinary single-parent commit, not a merge.\n\n\"git rebase -p --onto HEAD commit^ commit\" does the right thing,\nbut has two annoying properties:\n\n1) It actually checks out \"commit\", then goes back to HEAD, thus\n forcing a lot of recompiltion of source files that experience\n no net change from the operation.\n2) Because it's intended for multi-step use, it stops and waits for\n confirmation if there are rerere changes. I'd rather it just did the\n commit if there are no remaining conflict markers, and I'll reset or\n amend it if I'm not happy with the result.\n\nDoes something like this exist already?\n\nThank you!\n"},{"id":"220909","messageId":"7v7ghwo4u4.fsf@alter.siamese.dyndns.org","threadId":"34146","inReplyTo":"20130614193729.17663.qmail@science.horizon.com","subject":"Re: Is there a way to cherry-pick a merge?","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-06-14T19:44:03Z","receivedAt":"2013-06-14T19:44:03Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"George Spelvin\" writes:\n\n> Sometimes I'd like to repeat a previously performed merge, preserving\n> the commit message. And, if possible, the conflict resolutions.\n\nIs it \"git merge commit^2\"?\n"},{"id":"220910","messageId":"20130614213656.6813.qmail@science.horizon.com","threadId":"34146","inReplyTo":"7v7ghwo4u4.fsf@alter.siamese.dyndns.org","subject":"Re: Is there a way to cherry-pick a merge?","fromName":"George Spelvin","fromEmail":"linux@horizon.com","sentAt":"2013-06-14T21:36:56Z","receivedAt":"2013-06-14T21:36:56Z","isPatch":false,"sender":{"key":"linux@horizon.com","avatar":null},"body":"\"George Spelvin\" writes:\n>> Sometimes I'd like to repeat a previously performed merge, preserving\n>> the commit message. And, if possible, the conflict resolutions.\n> \n> Is it \"git merge commit^2\"?\n\nI suppose that was an obvious one to leave out of my alternatives list.\n\nThis is what I've been doing, but it requires I cut and paste the commit\nmessage. Preserving timestamps, author, etc. is even more awkward.\n\nThat's why I've been looking for an alternative.\n"},{"id":"220916","messageId":"7vobb8mk7z.fsf@alter.siamese.dyndns.org","threadId":"34146","inReplyTo":"20130614213656.6813.qmail@science.horizon.com","subject":"Re: Is there a way to cherry-pick a merge?","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-06-14T21:54:40Z","receivedAt":"2013-06-14T21:54:40Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"George Spelvin\" writes:\n\n> \"George Spelvin\" writes:\n>>> Sometimes I'd like to repeat a previously performed merge, preserving\n>>> the commit message. And, if possible, the conflict resolutions.\n>> \n>> Is it \"git merge commit^2\"?\n>\n> I suppose that was an obvious one to leave out of my alternatives list.\n>\n> This is what I've been doing, but it requires I cut and paste the commit\n> message. Preserving timestamps, author, etc. is even more awkward.\n\nIn the meantime, \"git commit --amend -C commit\" would be a\nworkaround, I would guess.\n"},{"id":"220926","messageId":"20130615030327.29278.qmail@science.horizon.com","threadId":"34146","inReplyTo":"7vobb8mk7z.fsf@alter.siamese.dyndns.org","subject":"Re: Is there a way to cherry-pick a merge?","fromName":"George Spelvin","fromEmail":"linux@horizon.com","sentAt":"2013-06-15T03:03:27Z","receivedAt":"2013-06-15T03:03:27Z","isPatch":false,"sender":{"key":"linux@horizon.com","avatar":null},"body":"> In the meantime, \"git commit --amend -C commit\" would be a\n> workaround, I would guess.\n\nAh! A useful feature I was not familiar with.\nDefinitely helps a great deal. Thank you!\n"}]}