From: Darrin Thompson <darrint@progeny.com>
To: git@vger.kernel.org
Subject: Merges without bases
Date: Thu, 25 Aug 2005 16:10:28 -0500 [thread overview]
Message-ID: <1125004228.4110.20.camel@localhost.localdomain> (raw)
I have a weird situation I want to support. I want to be able to merge a
foreign-tree repeatedly.
What makes the foreign tree foreign is that it may not yet share any
history with this branch.
What I tried to do was fetch foreign tree material and run octopus.
Octopus understandably barfed when it could not find a merge base for
the foreign tree.
What I think is newsworthy is that I figured out a sick way to get it
done. I created an empty tree object and used it as the merge base for
git-read-tree -m.
Could git-read-tree -m 3-args be made smart enough to treat a 0 as arg 1
as an implicit empty tree?
Once that is done, git octopus will be able to handle the no merge base
case.
--
Darrin
next reply other threads:[~2005-08-25 21:10 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-08-25 21:10 Darrin Thompson [this message]
2005-08-25 21:29 ` Merges without bases Darrin Thompson
2005-08-25 22:26 ` Junio C Hamano
2005-08-25 22:59 ` Darrin Thompson
2005-09-08 18:01 ` Tim Ottinger
2005-08-26 4:09 ` Daniel Barkalow
2005-08-26 8:00 ` Junio C Hamano
2005-09-09 12:02 ` Eric W. Biederman
2005-08-26 9:17 ` Martin Langhoff
2005-08-26 16:37 ` Daniel Barkalow
2005-08-27 6:48 ` Martin Langhoff
2005-08-27 20:49 ` Daniel Barkalow
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1125004228.4110.20.camel@localhost.localdomain \
--to=darrint@progeny.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.