Re: [RFC/PATCH 2/3] pull: trivial cleanups

From: Felipe Contreras <felipe.contreras@gmail.com>
Date: May 16, 2013, 08:56 UTC
Message-ID: <CAMP44s0sg6zQc9=cD1X61joxSd=LK7qT1k-suej3dYDD826hgw@mail.gmail.com>
In-Reply-To: <CALkWK0=tP=v=3Q4dzPc=W0=j_7iFYdGnzkaV6U_MFSg=NCE49w@mail.gmail.com>

On Thu, May 16, 2013 at 3:29 AM, Ramkumar Ramachandra <artagnon@gmail.com> wrote:

Show 6 quoted lines

> Felipe Contreras wrote:
>>  git-pull.sh | 6 ++----
>>  1 file changed, 2 insertions(+), 4 deletions(-)
>
> This one obviously looks good.  I'm not sure why you sent it along
> with the other two patches though.

Because this patch depends on the previous one.

Show 7 quoted lines

> On a related note, I'm interested in fixing pull.  What I have on paper so far:
>
> - pull.condition = clean-worktree | ff-update | no-local-changes |
> always | never
> - pull.action = merge | rebase* | reset
> - pull.resetType = soft | hard | merge | keep
> - pull.autostash = true | false

I don't understand that. But my only concern is that there's no way to do something like:

% git fetch backup 'refs/tags/*:refs/tags/*' 'refs/heads/*:refs/heads/*'

-- 
Felipe Contreras