Re: git-subtree split O(N)

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



> Vinnie> I'm using git-subtree split to extract changes to a directory
>
> Are you using -rejoin?

I am not using --rejoin. Admittedly, the documentation is somewhat
opaque on its usage:

"--rejoin:: This option is only valid for the split command."

This is confusing. One would think that an option named "rejoin" has
more to do with merge or pull than split. Although I guess the meaning
is that you want your local changes to "rejoin" the upstream?

"...future splits can search only the part of history that has been
added since the most recent --rejoin."

This sounds exactly like my use-case, I want to avoid starting from
initial commit on a split, but...

"If you do all your merges with '--squash', don't use '--rejoin' when
you split, because you don't want the subproject's history to be part
of your project anyway."

I always use --squash with git-subtree pull, so I interpreted this to
mean I should never use --rejoin.

"Unfortunately, using this option results in 'git log' showing an
extra copy of every new commit that was created"

This is what discouraged me from ever touching "--rejoin"

I hope this helps

Thanks
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]