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
Description: OpenPGP digital signature