Re: [PATCH 1/2] Fix support for merge options.

2018-05-05 Thread Christian Couder
On Sat, May 5, 2018 at 5:41 PM, wrote: > Christian wrote: >> >> It looks like git-reintegrate is not managed in Git but in this >> repository : >> >> https://github.com/felipec/git-reintegrate >> >> So could be a bit confusing to send those patches to the Git mailing >> list without telling that

Re: [PATCH 1/2] Fix support for merge options.

2018-05-05 Thread ydirson
Christian wrote: > Hi Yann, > > On Sat, May 5, 2018 at 3:24 PM, Yann Dirson wrote: > > --- > > git-reintegrate | 6 +++--- > > 1 file changed, 3 insertions(+), 3 deletions(-) > > > > diff --git a/git-reintegrate b/git-reintegrate > > It looks like git-reintegrate is not managed in Git but in th

Re: [PATCH 1/2] Fix support for merge options.

2018-05-05 Thread Christian Couder
Hi Yann, On Sat, May 5, 2018 at 3:24 PM, Yann Dirson wrote: > --- > git-reintegrate | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/git-reintegrate b/git-reintegrate It looks like git-reintegrate is not managed in Git but in this repository : https://github.com/f

[PATCH 1/2] Fix support for merge options.

2018-05-05 Thread Yann Dirson
--- git-reintegrate | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/git-reintegrate b/git-reintegrate index a1c17d2..da45239 100755 --- a/git-reintegrate +++ b/git-reintegrate @@ -338,7 +338,7 @@ class Integration def finalize_command(cmd, args, message) begin