Re: [PATCH v6 4/7] pull: add --merge option

brian m. carlson wrote:

My point is that it's unclear to me what options I need to use to
retain the current behavior (fast-forward if possible, merge
otherwise) without a warning.

The current behavior is to always merge (ff or otherwise), just what
`git merge` would do, so `git pull --merge`. I don't see what's
confusing about that.

-- 
Felipe Contreras