{"thread":{"id":"20292","subject":"Merge-base algorithm?","startedAt":"2009-07-30T04:16:30Z","lastAt":"2009-07-30T18:42:19Z","messageCount":2,"participants":["Josh ben Jore"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"119150","messageId":"D5F958F92101F74D8A5683C2FE14F4200F231037@post.corp.w3data.com","threadId":"20292","inReplyTo":null,"subject":"Merge-base algorithm?","fromName":"Josh ben Jore","fromEmail":"jbenjore@whitepages.com","sentAt":"2009-07-30T04:16:30Z","receivedAt":"2009-07-30T04:16:30Z","isPatch":false,"sender":{"key":"jbenjore@whitepages.com","avatar":null},"body":"What is the merge-base algorithm for selecting nodes? How can I subsume nodes in the selected list?\n\nI want to change the result of my current merge-base command. Right now it includes nodes \"A\", \"B\", and \"C\" and I am experiencing a segmentation fault when merging \"A\" and \"B.\" I want to add a commit to the tree which subsumes nodes \"A\" and \"B\" so that my merge-base is against \"new node(A+B)\" and \"C\" or something similar.\n\nI am attempting to work around the bug described in the thread \"Null deref in recursive merge in df73af5f667a479764d2b2195cb0cb60b0b89e3d.\"\n\nRegards,\nJosh\n"},{"id":"119186","messageId":"C697379B.61EB1%jbenjore@whitepages.com","threadId":"20292","inReplyTo":"D5F958F92101F74D8A5683C2FE14F4200F231037@post.corp.w3data.com","subject":"Re: Merge-base algorithm?","fromName":"Josh ben Jore","fromEmail":"jbenjore@whitepages.com","sentAt":"2009-07-30T18:42:19Z","receivedAt":"2009-07-30T18:42:19Z","isPatch":false,"sender":{"key":"jbenjore@whitepages.com","avatar":null},"body":"On 7/29/09 9:16 PM, \"Josh ben Jore\" <jbenjore@whitepages.com> wrote:\n\n> What is the merge-base algorithm for selecting nodes?\n\nOops, my /opt/git/bin/git merge-base --help on the approximately 1.6.4 was\nusing the documentation from the other git in /usr/bin/git. While reading\nthe source tree, I found Documentation/git-merge-base.txt which answered\nthis question.\n\nThe docs I'd read still said to read the source code.\n\nJosh\n"}]}