From: Ramkumar Ramachandra <artagnon@gmail.com>
Date: Thu, 16 May 2013 08:29:46 GMT
Subject: Re: [RFC/PATCH 2/3] pull: trivial cleanups
Message-ID: <CALkWK0=tP=v=3Q4dzPc=W0=j_7iFYdGnzkaV6U_MFSg=NCE49w@mail.gmail.com>
In-Reply-To: <1368675828-27418-3-git-send-email-felipe.contreras@gmail.com>

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.

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

(ff-update is satisfied when FETCH_HEAD is directly ahead of
refs/remotes/<branch>, while no-local-changes is satisfied when
FETCH_HEAD is directly ahead of refs/heads/<branch>)

Any clue how to design branch-specific pull configuration?