RE: Bug With git rebase -p

2018-03-23 Thread Johannes Schindelin
Hi Joseph, On Thu, 22 Mar 2018, Joseph Strauss wrote: > I meant to say that I installed 2.17.0-rc0, and it worked perfectly. Thank you for testing. Ciao, Johannes

RE: Bug With git rebase -p

2018-03-22 Thread Joseph Strauss
gt; Cc: Joseph Strauss <josep...@bhphoto.com>; git@vger.kernel.org Subject: Re: Bug With git rebase -p Johannes Schindelin <johannes.schinde...@gmx.de> writes: > On Tue, 20 Mar 2018, Joseph Strauss wrote: > >> Perfect. Thank you. > > You are welcome. > > I am

Re: Bug With git rebase -p

2018-03-22 Thread Junio C Hamano
Johannes Schindelin writes: > On Tue, 20 Mar 2018, Joseph Strauss wrote: > >> Perfect. Thank you. > > You are welcome. > > I am puzzled, though... does your message mean that you tested the Git for > Windows v2.17.0-rc0 installer and it did fix your problem? Or do you

RE: Bug With git rebase -p

2018-03-21 Thread Johannes Schindelin
Hi Joseph, On Tue, 20 Mar 2018, Joseph Strauss wrote: > Perfect. Thank you. You are welcome. I am puzzled, though... does your message mean that you tested the Git for Windows v2.17.0-rc0 installer and it did fix your problem? Or do you simply assume that it does fix your problem because Junio

RE: Bug With git rebase -p

2018-03-20 Thread Joseph Strauss
Perfect. Thank you. -Original Message- From: Johannes Schindelin [mailto:johannes.schinde...@gmx.de] Sent: Tuesday, March 20, 2018 10:53 AM To: Junio C Hamano <gits...@pobox.com> Cc: Joseph Strauss <josep...@bhphoto.com>; git@vger.kernel.org Subject: Re: Bug With git r

Re: Bug With git rebase -p

2018-03-20 Thread Johannes Schindelin
Hi, On Mon, 19 Mar 2018, Junio C Hamano wrote: > Joseph Strauss writes: > > > I found the following erroneous behavior with "git rebase -p". > > > > My current version is git version 2.16.2.windows.1 > > > > I made an example at GitHub,

Re: Bug With git rebase -p

2018-03-19 Thread Junio C Hamano
Joseph Strauss writes: > I found the following erroneous behavior with "git rebase -p". > > My current version is git version 2.16.2.windows.1 > > I made an example at GitHub, https://github.com/jkstrauss/git-bug/ > > There seem to be two problems when rebasing merge

Bug With git rebase -p

2018-03-19 Thread Joseph Strauss
I found the following erroneous behavior with "git rebase -p". My current version is git version 2.16.2.windows.1 I made an example at GitHub, https://github.com/jkstrauss/git-bug/ There seem to be two problems when rebasing merge commits with git rebase -p : 1. All lines of merge commits'