Re: [1.8.0] fix branch.autosetupmerge and branch.autosetuprebase

From: Jay Soffian <jaysoffian@gmail.com>
Date: Feb 28, 2011, 23:43 UTC
Message-ID: <AANLkTi=nhc=a6wW9BPiDy_2rbZQCVmhZ75u7MuF33w06@mail.gmail.com>
In-Reply-To: <A8063D85-43A0-474A-8467-DE8473F52ECB@spy.net>

On Mon, Feb 28, 2011 at 6:03 PM, Dustin Sallings <dustin@spy.net> wrote:

Show 10 quoted lines

>
> On Feb 28, 2011, at 14:37, Jay Soffian wrote:
>
> 2. Deprecate branch.autosetuprebase. Pull's default action shouldn't
> be specified when the branch is created. Rather, add a "pull.rebase"
> boolean defaulting to false, and which is overridden per-branch by
> branch.<name>.rebase.
>
> Do you mean to say ``pull.rebase'' configured to true would do the same
> thing?

Effectively, yes. If a user specifies "pull.rebase true" in their .gitconfig or repo .git/config, then when they "git pull" while on branch <name>, pull will rebase, unless branch.<name>.rebase exists and is set to false.

any branches that don't have an explicit "branch.<name>.rebase = false" will

> If so, I'm fine with killing off branch.autosetuprebase.  The goal is to
> have something I can easily give to other people so that we all work the
> same way.

Understood. I recently have the same goal, but my users have pre-existing branches that they setup before I told them to "git config branch.autosetuprebase true". Now they need to go configure every one of those branches to rebase by default.

It would be nice if I could just tell them "git config --global pull.rebase true" and have it affect all their repos and branches. :-)

j.