From: W. Trevor King <wking@tremily.us>
Date: Fri, 02 May 2014 14:13:59 GMT
Subject: Re: [PATCH v6 1/7] pull: rename pull.rebase to pull.mode
Message-ID: <20140502141359.GE28634@odin.tremily.us>
In-Reply-To: <1398988808-29678-2-git-send-email-felipe.contreras@gmail.com>

On Thu, May 01, 2014 at 07:00:02PM -0500, Felipe Contreras wrote:
> Also 'branch.<name>.rebase' to 'branch.<name>.pullmode'.

Perhaps this has already been hashed out in a previous version of this
series, but we may want to use pull.update and branch.<name>.update to
match the existing submodule.<name>.update.  Both settings are
selecting the default integration style between HEAD and some other
reference (pull's remote branch, the gitlinked commit, or the
submodule's --remote branch).

Cheers,
Trevor

-- 
This email may be signed or encrypted with GnuPG (http://www.gnupg.org).
For more information, see http://en.wikipedia.org/wiki/Pretty_Good_Privacy