From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Fri, 02 May 2014 20:14:44 GMT
Subject: Re: [PATCH v6 4/7] pull: add --merge option
Message-ID: <5363fcb47c77d_135215292ec3c@nysa.notmuch>
In-Reply-To: <20140502193250.GF75770@vauxhall.crustytoothpaste.net>

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