Re: [PATCH 1/4] subtree: support split --rejoin --squash

2014-01-23 Thread Pierre Penninckx
Hi again, After using the patched git-subtree (with patches 1 to 3) for a while, I suspect the added functionality does not do exactly what I wanted. So yes, now when doing a rejoin, the squash of the split commits is used. But how can I push this squash instead of the individual commits? The

Re: [PATCH 1/4] subtree: support split --rejoin --squash

2014-01-23 Thread Matthew Ogilvie
On Thu, Jan 23, 2014 at 09:51:49AM +0100, Pierre Penninckx wrote: Hi again, After using the patched git-subtree (with patches 1 to 3) for a while, I suspect the added functionality does not do exactly what I wanted. So yes, now when doing a rejoin, the squash of the split commits is used.

Re: [PATCH 1/4] subtree: support split --rejoin --squash

2014-01-22 Thread Matthew Ogilvie
On Wed, Jan 22, 2014 at 03:58:28PM +0100, Pierre Penninckx wrote: 2013/12/7 Matthew Ogilvie mmogilvi_...@miniinfo.net Subject: [PATCH 1/4] subtree: support split --rejoin --squash Allow using --squash with git subtree split --rejoin. It will still split off (and save to --branch) the

Re: [PATCH 1/4] subtree: support split --rejoin --squash

2013-12-10 Thread Junio C Hamano
Matthew Ogilvie mmogilvi_...@miniinfo.net writes: Allow using --squash with git subtree split --rejoin. It will still split off (and save to --branch) the complete subtree history, but the merge done for the --rejoin will be merging a squashed representation of the new subtree commits,