* Merge-base algorithm?
@ 2009-07-30 4:16 Josh ben Jore
2009-07-30 18:42 ` Josh ben Jore
0 siblings, 1 reply; 2+ messages in thread
From: Josh ben Jore @ 2009-07-30 4:16 UTC (permalink / raw)
To: 'git@vger.kernel.org'
What is the merge-base algorithm for selecting nodes? How can I subsume nodes in the selected list?
I 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.
I am attempting to work around the bug described in the thread "Null deref in recursive merge in df73af5f667a479764d2b2195cb0cb60b0b89e3d."
Regards,
Josh
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: Merge-base algorithm?
2009-07-30 4:16 Merge-base algorithm? Josh ben Jore
@ 2009-07-30 18:42 ` Josh ben Jore
0 siblings, 0 replies; 2+ messages in thread
From: Josh ben Jore @ 2009-07-30 18:42 UTC (permalink / raw)
To: Git
On 7/29/09 9:16 PM, "Josh ben Jore" <jbenjore@whitepages.com> wrote:
> What is the merge-base algorithm for selecting nodes?
Oops, my /opt/git/bin/git merge-base --help on the approximately 1.6.4 was
using the documentation from the other git in /usr/bin/git. While reading
the source tree, I found Documentation/git-merge-base.txt which answered
this question.
The docs I'd read still said to read the source code.
Josh
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-07-30 18:42 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-07-30 4:16 Merge-base algorithm? Josh ben Jore
2009-07-30 18:42 ` Josh ben Jore
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).