Re: Limitiations of git rebase --preserve-merges --interactive

2016-09-23 Thread Stefan Beller
On Fri, Sep 23, 2016 at 2:13 PM, Johannes Schindelin wrote: > Hi Stefan, > > On Fri, 23 Sep 2016, Stefan Haller wrote: > >> Stefan Beller wrote: >> >> > On Thu, Sep 22, 2016 at 12:48 PM, Kevin Daudt wrote: >> > > On Thu, Sep 22,

Re: Limitiations of git rebase --preserve-merges --interactive

2016-09-23 Thread Johannes Schindelin
Hi Stefan, On Fri, 23 Sep 2016, Stefan Haller wrote: > Stefan Beller wrote: > > > On Thu, Sep 22, 2016 at 12:48 PM, Kevin Daudt wrote: > > > On Thu, Sep 22, 2016 at 07:33:11PM +, Anatoly Borodin wrote: > > >> Hi Stefan, > > >> > > >> this section was

Re: Limitiations of git rebase --preserve-merges --interactive

2016-09-23 Thread Johannes Schindelin
Hi, On Thu, 22 Sep 2016, Stefan Beller wrote: > On Thu, Sep 22, 2016 at 2:01 PM, Anatoly Borodin > wrote: > > Hi Stefan, > > > > I've also done some archaeology and found that the original version of > > the merge preserving code was written by Johannes Schindelin > >

Re: Limitiations of git rebase --preserve-merges --interactive

2016-09-23 Thread Johannes Sixt
Am 23.09.2016 um 17:50 schrieb Stefan Haller: And I don't see any tests that do rebase -p -i and actually do something interesting with the -i part. So my original question still remains. :-) -i -p came first. -p without -i was bolted on later. -- Hannes

Re: Limitiations of git rebase --preserve-merges --interactive

2016-09-23 Thread Junio C Hamano
li...@haller-berlin.de (Stefan Haller) writes: > Thanks, this is interesting; I'm having trouble understanding the tests > though. Some of them use rebase -p -i, but I don't understand why they > use -i, or why that even works in a test (i.e. why it doesn't open an > editor). Upon starting up,

Re: Limitiations of git rebase --preserve-merges --interactive

2016-09-23 Thread Stefan Haller
Anatoly Borodin wrote: > PS There are also some pieces of "what should work" in these tests: > > t/t3409-rebase-preserve-merges.sh* > t/t3410-rebase-preserve-dropped-merges.sh* > t/t3411-rebase-preserve-around-merges.sh* > t/t3414-rebase-preserve-onto.sh* Thanks,

Re: Limitiations of git rebase --preserve-merges --interactive

2016-09-23 Thread Stefan Haller
Stefan Beller wrote: > On Thu, Sep 22, 2016 at 12:48 PM, Kevin Daudt wrote: > > On Thu, Sep 22, 2016 at 07:33:11PM +, Anatoly Borodin wrote: > >> Hi Stefan, > >> > >> this section was added to the manual in the commit > >>

Re: Limitiations of git rebase --preserve-merges --interactive

2016-09-22 Thread Stefan Beller
On Thu, Sep 22, 2016 at 2:01 PM, Anatoly Borodin wrote: > Hi Stefan, > > I've also done some archaeology and found that the original version of > the merge preserving code was written by Johannes Schindelin > , see e.g. I think it would be

Re: Limitiations of git rebase --preserve-merges --interactive

2016-09-22 Thread Anatoly Borodin
Hi Kevin, Kevin Daudt wrote: > Changing the order, or dropping commits might then give unexpected > results. The question that Stefan has is rather "what is *supposed* to work / give *expected* results?". Some stuff can be found in the tests (t/t*rebase*preserve*), but maybe

Re: Limitiations of git rebase --preserve-merges --interactive

2016-09-22 Thread Anatoly Borodin
Hi Stefan, I've also done some archaeology and found that the original version of the merge preserving code was written by Johannes Schindelin , see e.g. f09c9b8c5ff9d8a15499b09ccd6c3e7b3c76af77 There were also some big discussion threads in 2007-2008 regarding a

Re: Limitiations of git rebase --preserve-merges --interactive

2016-09-22 Thread Stefan Beller
On Thu, Sep 22, 2016 at 12:48 PM, Kevin Daudt wrote: > On Thu, Sep 22, 2016 at 07:33:11PM +, Anatoly Borodin wrote: >> Hi Stefan, >> >> this section was added to the manual in the commit >> cddb42d2c58a9de9b2b5ef68817778e7afaace3e by "Jonathan Nieder" >> 6

Re: Limitiations of git rebase --preserve-merges --interactive

2016-09-22 Thread Kevin Daudt
On Thu, Sep 22, 2016 at 07:33:11PM +, Anatoly Borodin wrote: > Hi Stefan, > > this section was added to the manual in the commit > cddb42d2c58a9de9b2b5ef68817778e7afaace3e by "Jonathan Nieder" > 6 years ago. Maybe he remembers better? > Just to make it clear, this

Re: Limitiations of git rebase --preserve-merges --interactive

2016-09-22 Thread Anatoly Borodin
Hi Stefan, this section was added to the manual in the commit cddb42d2c58a9de9b2b5ef68817778e7afaace3e by "Jonathan Nieder" 6 years ago. Maybe he remembers better? -- Mit freundlichen Grüßen, Anatoly Borodin