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

2014-01-23 Thread Matthew Ogilvie
ne or after the previous message, not at the top, so new people can more easily pick up the discussion.] - Matthew > 2014/1/23 Matthew Ogilvie : > > On Wed, Jan 22, 2014 at 03:58:28PM +0100, Pierre Penninckx wrote: > >> 2013/12/7 Matthew Ogilvie >

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

2014-01-23 Thread Pierre Penninckx
n Wed, Jan 22, 2014 at 03:58:28PM +0100, Pierre Penninckx wrote: >> 2013/12/7 Matthew Ogilvie >> > Subject: [PATCH 1/4] subtree: support split --rejoin --squash >> > >> > Allow using --squash with "git subtree split --rejoin". It >> > will

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 > > Subject: [PATCH 1/4] subtree: support split --rejoin --squash > > > > Allow using --squash with "git subtree split --rejoin". It > > will still split of

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

2013-12-10 Thread Junio C Hamano
Matthew Ogilvie 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, instead of the commit

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

2013-12-07 Thread Matthew Ogilvie
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, instead of the commits themselves (similar to how "git su