Thread (24 messages) flat view 24 messages, 3 authors, 2016-06-15

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

From: Felipe Contreras <hidden>
Date: 2016-06-15 22:57:16

On Thu, May 16, 2013 at 3:29 AM, Ramkumar Ramachandra
[off-list ref] wrote:
Felipe Contreras wrote:
quoted
 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.
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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help