Re: git --merge and option parsing

2017-05-23 Thread Jeff King
On Tue, May 23, 2017 at 10:17:18AM +, Holst, Henrik wrote: > I am not sure if this is a bug but it was surprising to me so I > thought I'd report it here. > > I added `ui.column=auto` to my gitconfig and that does not work so > well with pipes so I want to use `--no-column` option. I was a bi

git --merge and option parsing

2017-05-23 Thread Holst, Henrik
Hi, I am not sure if this is a bug but it was surprising to me so I thought I'd report it here. I added `ui.column=auto` to my gitconfig and that does not work so well with pipes so I want to use `--no-column` option. I was a bit surprised that this does not work? It seems that `--merged` pick