Re: [PATCH] pull: add pull.autoStash config option

[Junio C Hamano <gitster@xxxxxxxxx>]

Eric Sunshine <sunshine@xxxxxxxxxxxxxx> writes:

>>                 if (opt_autostash == -1)
>> -                       opt_autostash = config_autostash;
>> +                       opt_autostash = config_pull_autostash == -1 ? config_rebase_autostash : config_pull_autostash;
>
> You may want to wrap this over-long line. Perhaps:
>
>     opt_autostash = config_pull_autostash == -1 ?
>         config_rebase_autostash : config_pull_autostash;

Alternatively

	opt_autostash = (config_pull_autostash == -1
			 ? config_rebase_autostash
			 : config_pull_autostash);