From: Avery Pennarun <apenwarr@gmail.com>
To: Andrey Smirnov <allter@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH/RFC 1/2] Add 'git subtree' command for tracking history of subtrees separately.
Date: Thu, 16 Jul 2009 18:27:40 -0400 [thread overview]
Message-ID: <32541b130907161527l1955bf06pf54b5099a5988c65@mail.gmail.com> (raw)
In-Reply-To: <cdea6cd10907161509g7771c72bl608b1924785b49fc@mail.gmail.com>
On Thu, Jul 16, 2009 at 6:09 PM, Andrey Smirnov<allter@gmail.com> wrote:
> On Thu, Jul 16, 2009 at 10:34 PM, Avery Pennarun<apenwarr> wrote:
>> I don't think that's a good idea. git-subtree is completely separate
>> from rebasing, and doesn't deal with patches at all. Maybe there
>> should be some kind of "force-update" option that does what "git
>> subtree add" does, but wiping out everything in the subtree before it
>> starts. That would have simplified the above commands a bit.
>
> The only thing that links git-subtree with git-rebase is the fact, that
> git-subtree "knows" the target commit for rebases dealing with subtrees.
> So if one knows commit of a subtree that he wishes to see in superproject
> (in my case "test-split") he could issue:
> git subtree rebase --prefix=lib OldProject test-split
>
> Though simple:
> git rebase --onto OldProject test-split-old test-split
> worked for me, I think this was a lucky coincidence because of simplicity
> of my library commits.
I don't really understand what you're asking for here. rebase doesn't
have any parameters called a "target." What does git-subtree know
that you don't know?
Have fun,
Avery
next prev parent reply other threads:[~2009-07-16 22:28 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-26 22:29 [PATCH/RFC 1/2] Add 'git subtree' command for tracking history of subtrees separately Avery Pennarun
2009-04-26 22:29 ` [PATCH/RFC 2/2] Automated test script for 'git subtree' Avery Pennarun
2009-04-30 2:27 ` [PATCH/RFC 1/2] Add 'git subtree' command for tracking history of subtrees separately Avery Pennarun
2009-04-30 3:44 ` Ping Yin
2009-04-30 8:58 ` Finn Arne Gangstad
2009-04-30 14:32 ` Avery Pennarun
2009-07-16 18:04 ` Andrey Smirnov
2009-07-16 18:34 ` Avery Pennarun
2009-07-16 22:09 ` Andrey Smirnov
2009-07-16 22:27 ` Avery Pennarun [this message]
2009-07-17 7:16 ` Andrey Smirnov
2009-07-17 15:47 ` Avery Pennarun
2009-07-17 17:46 ` Andrey Smirnov
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=32541b130907161527l1955bf06pf54b5099a5988c65@mail.gmail.com \
--to=apenwarr@gmail.com \
--cc=allter@gmail.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 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).