A git question: how do I merge just *some* diffs from branch A into branch B?
ie I want to do a sort of combination of git cherrypick & git add -i (patch
mode) - pull in some of the diffs from some of the files from A revision x into
B's HEAD.
I could just make another clone into another directory, git reset to revision
x, and use vimdiff. But that seems inelegant :-)
--
Sonia.
--
SLUG - Sydney Linux User's Group Mailing List - http://slug.org.au/
Subscription info and FAQs: http://slug.org.au/faq/mailinglists.html
