From: Matt Rice <ratmice@gmail.com>
To: GDB <gdb@sourceware.org>
Subject: Re: gdb.git mirror is broken
Date: Sat, 10 Oct 2009 05:35:00 -0000 [thread overview]
Message-ID: <8ba6bed40910092235g67902282kf4cf753107066049@mail.gmail.com> (raw)
In-Reply-To: <8ba6bed40910062129s1f2fa86o3ade15bb03671664@mail.gmail.com>
On Tue, Oct 6, 2009 at 9:29 PM, Matt Rice <ratmice@gmail.com> wrote:
<snip>
> by splitting bfd out, then subtree-merging it back in,
> then doing a subtree merge to the separated bfd, when binutils changes...
>
> one of the downsides to this is it is going to create alot of merge
> commits which looks kind of funky in the separated bfd's gitk,
<snip>
It just occurred to me that when merging from the large combined tree
back into the split out subtrees, assuming that these simply track the
main tree and nobody is given write access
I believe we can safely
$ git fetch binutils
$ git rebase -s subtree binutils/master
instead of the
$ git merge -s subtree binutils/master
without worrying about rebase rewriting commits, since it is strictly a sink.
instead of git merge -s subtree and avoid all of these merge commits
next prev parent reply other threads:[~2009-10-10 5:35 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-10-06 0:31 H.J. Lu
2009-10-06 6:23 ` Pierre Muller
2009-10-06 6:45 ` Jim Meyering
2009-10-06 6:51 ` Jim Meyering
2009-10-06 7:38 ` Jim Meyering
2009-10-06 13:08 ` H.J. Lu
2009-10-06 14:07 ` Jim Meyering
2009-10-06 14:26 ` Joseph S. Myers
2009-10-06 14:33 ` Jim Meyering
2009-10-06 16:11 ` Joseph S. Myers
2009-10-07 4:29 ` Matt Rice
2009-10-10 5:35 ` Matt Rice [this message]
2009-10-06 16:06 ` Tom Tromey
2009-10-06 16:21 ` Jim Meyering
2009-10-06 15:45 ` Joel Brobecker
2009-10-06 18:38 ` Eli Zaretskii
2009-10-06 19:01 ` Joel Brobecker
2009-10-06 20:36 ` Eli Zaretskii
2009-10-06 21:10 ` Joel Brobecker
2009-10-06 22:04 ` Tom Tromey
2009-10-07 7:29 ` Eli Zaretskii
2009-10-07 7:27 ` Eli Zaretskii
2009-10-06 16:08 ` Tom Tromey
2009-10-06 16:09 ` Jim Meyering
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=8ba6bed40910092235g67902282kf4cf753107066049@mail.gmail.com \
--to=ratmice@gmail.com \
--cc=gdb@sourceware.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox