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? -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html