git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: <dag@cray.com>
To: Vinnie Falco <vinnie.falco@gmail.com>
Cc: <git@vger.kernel.org>
Subject: Re: git-subtree split O(N)
Date: Tue, 1 May 2012 14:49:32 -0500	[thread overview]
Message-ID: <nnghavzu1f7.fsf@transit.us.cray.com> (raw)
In-Reply-To: <CA+EzHGfiRg+w8FsvrXEi0Yr4oVzxaZA_1JT8cmRR0YrYG7m6AQ@mail.gmail.com> (Vinnie Falco's message of "Mon, 30 Apr 2012 18:39:20 -0700")

Vinnie Falco <vinnie.falco@gmail.com> writes:

> The problem is that every time I split, git-subtree starts from the
> very beginning of the commit log and works its way forward. I thought
> that it was only supposed to do that once, and that subsequent splits
> would start from the last commit in the destination branch (I keep the
> split branch around).
>
> What's going on?

This is an area I want to improve.

You have to use --rejoin so subtree will remember where you left off
last time.  I also always specify a branch name, like this:

git subtree split -P subproj --rejoin --branch=subproj-to-push

I think --rejoin should probably be default but I need to understand the
code better to make sure.

HTH.

                              -Dave

      parent reply	other threads:[~2012-05-01 19:51 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-05-01  1:39 git-subtree split O(N) Vinnie Falco
2012-05-01  3:03 ` Randal L. Schwartz
2012-05-01  3:10   ` Vinnie Falco
2012-05-01 19:49 ` dag [this message]

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=nnghavzu1f7.fsf@transit.us.cray.com \
    --to=dag@cray.com \
    --cc=git@vger.kernel.org \
    --cc=vinnie.falco@gmail.com \
    /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).