Hi,

On Tue, Jul 23, 2013 at 12:53:25PM +0530, Ramkumar Ramachandra <artagnon@gmail.com> wrote:
> Junio C Hamano wrote:
> > * mv/merge-ff-tristate (2013-07-02) 1 commit
> >   (merged to 'next' on 2013-07-09 at c32b95d)
> >  + merge: handle --ff/--no-ff/--ff-only as a tri-state option
> 
> Sorry I didn't notice sooner, but I was confused by the second test
> title this added:
> 
> test_expect_success 'option --ff-only overwrites merge.ff=only config' '
> 	git reset --hard c0 &&
> 	test_config merge.ff only &&
> 	git merge --no-ff c1
> '
> 
> How is --ff-only overwriting merge.ff=only here?  Was it a typo?

Yes, it's a typo in the test name. Thanks for spotting that!

Miklos