Re: Git garden shears, was Re: [PATCH 13/22] sequencer: remember the onelines when parsing the todo file

Hi Kuba, On Wed, 21 Sep 2016, Jakub Narębski wrote: > W dniu 11.09.2016 o 10:33, Johannes Schindelin napisał: > > On Fri, 9 Sep 2016, Jakub Narębski wrote: > [...] > > >> When preserving merges, there are (as far as I understand it), two > >> problems: > >> - what it means to preserve changes

Re: Git garden shears, was Re: [PATCH 13/22] sequencer: remember the onelines when parsing the todo file

Hello Dscho, W dniu 11.09.2016 o 10:33, Johannes Schindelin napisał: > On Fri, 9 Sep 2016, Jakub Narębski wrote: [...] >> When preserving merges, there are (as far as I understand it), two >> problems: >> - what it means to preserve changes (which change to pick, >>that is what is the

Git garden shears, was Re: [PATCH 13/22] sequencer: remember the onelines when parsing the todo file

Hi Kuba, On Fri, 9 Sep 2016, Jakub Narębski wrote: > Hello Johannes, > > W dniu 09.09.2016 o 17:12, Johannes Schindelin napisał: > > On Thu, 1 Sep 2016, Junio C Hamano wrote: > >> Johannes Schindelin writes: > > >> I was sort of expecting that, when you do the