Re: [PATCH 0/2] Fix --rebase-merges with custom commentChar

2018-07-12 Thread Junio C Hamano
Aaron Schrab writes: > Subject: [PATCH v2] sequencer: use configured comment character > > Use the configured comment character when generating comments about > branches in a todo list. Failure to honor this configuration causes a > failure to parse the resulting todo list. OK. > > Note that

Re: [PATCH 0/2] Fix --rebase-merges with custom commentChar

2018-07-11 Thread Aaron Schrab
Sorry for taking so long to get back to this. Hopefully the following will be acceptable to everyone. 8< - Subject: [PATCH v2] sequencer: use configured comment character Use the configured comment character when generating comments about branches in a todo list. Failure to honor this

Re: [PATCH 0/2] Fix --rebase-merges with custom commentChar

2018-07-10 Thread Daniel Harding
On Mon, 09 Jul 2018 at 10:53:14 +0300, Johannes Schindelin wrote> On Sun, 8 Jul 2018, Daniel Harding wrote: I have core.commentChar set in my .gitconfig, and when I tried to run git rebase -i -r, I received an error message like the following: error: invalid line 3: # Branch To fix this, I

Re: [PATCH 0/2] Fix --rebase-merges with custom commentChar

2018-07-09 Thread Johannes Schindelin
Hi Daniel, On Sun, 8 Jul 2018, Daniel Harding wrote: > I have core.commentChar set in my .gitconfig, and when I tried to run > git rebase -i -r, I received an error message like the following: > > error: invalid line 3: # Branch > > To fix this, I updated sequencer.c to use the configured

[PATCH 0/2] Fix --rebase-merges with custom commentChar

2018-07-08 Thread Daniel Harding
I have core.commentChar set in my .gitconfig, and when I tried to run git rebase -i -r, I received an error message like the following: error: invalid line 3: # Branch To fix this, I updated sequencer.c to use the configured commentChar for the Branch comments. I also tweaked the tests in