From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 10 Sep 2013 21:34:24 GMT
Subject: Re: [PATCH v3 1/5] pull: rename pull.rename to pull.mode
Message-ID: <xmqqppsgwecf.fsf@gitster.dls.corp.google.com>
In-Reply-To: <1378689796-19305-2-git-send-email-felipe.contreras@gmail.com>

Felipe Contreras <felipe.contreras@gmail.com> writes:

> Also 'branch.<name>.rebase' to 'branch.<name>.pullmode'.
>
> This way 'pull.mode' can be set to 'merge', and the default can be
> something else.
>
> The old configurations still work, but get deprecated.

Sounds good, but we should still mention these old names in the
documentation (and mark them as deprecated).

> +test "$mode" == 'rebase' && rebase="true"

POSIX test does not take "==" as string equality; it is a bash-ism.

	test "$mode" = rebase