This is a reroll of [1] which fixes a couple cases where rebase -i
ignores core.commentchar. One case was an oversight from the original
patch which added core.commentchar support to rebase -i, and is already
in 'maint'. The other is a regression introduced by [2] which is still
in 'next'.

In this reroll, the single patch from v1 is split into two: patch 1/2 is
suitable for 'maint'; and patch 2/2 is for 'next'. There are no other

I wanted to add tests to t3404 for these bugs but couldn't figure out
how to do it using the external interface of rebase -i. I was able to
verify before and after behavior by adding temporary echo's to the code
in order to observe the "internal" functioning.


Eric Sunshine (2):
  rebase -i: fix skip_unnecessary_picks() to respect core.commentchar
  rebase -i: fix core.commentchar regression | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to
More majordomo info at

Reply via email to