Re: Flatten history

2013-07-29 Thread Felipe Contreras
On Mon, Jul 29, 2013 at 8:42 PM, Hilco Wijbenga hilco.wijbe...@gmail.com wrote: Hi all, I have a (public) feature branch that has been kept up-to-date with master by regularly merging master back into it. I would now like to get all the changes from feature but not any of the commits.

Re: Flatten history

2013-07-29 Thread Bryan Turner
On 30 July 2013 13:50, Felipe Contreras felipe.contre...@gmail.com wrote: On Mon, Jul 29, 2013 at 8:42 PM, Hilco Wijbenga hilco.wijbe...@gmail.com wrote: Hi all, I have a (public) feature branch that has been kept up-to-date with master by regularly merging master back into it. I would now

Re: Flatten history

2013-07-29 Thread Hilco Wijbenga
On 29 July 2013 20:50, Felipe Contreras felipe.contre...@gmail.com wrote: On Mon, Jul 29, 2013 at 8:42 PM, Hilco Wijbenga hilco.wijbe...@gmail.com wrote: Hi all, I have a (public) feature branch that has been kept up-to-date with master by regularly merging master back into it. I would now

Re: Flatten history

2013-07-29 Thread Hilco Wijbenga
On 29 July 2013 20:59, Bryan Turner btur...@atlassian.com wrote: On 30 July 2013 13:50, Felipe Contreras felipe.contre...@gmail.com wrote: On Mon, Jul 29, 2013 at 8:42 PM, Hilco Wijbenga hilco.wijbe...@gmail.com wrote: Hi all, I have a (public) feature branch that has been kept up-to-date