From: Junio C Hamano Date: Tue, 23 Jul 2013 17:09:30 GMT Subject: Re: What's cooking in git.git (Jul 2013, #03; Tue, 9) Message-ID: <7vppu98aph.fsf@alter.siamese.dyndns.org> In-Reply-To: <20130723090659.GB9639@suse.cz> Miklos Vajna writes: >> 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! Thanks, will do this: Subject: [PATCH] t7600: fix typo in test title Spotted by Ram, confirmed by Miklos. Signed-off-by: Junio C Hamano --- t/t7600-merge.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh index 3ff5fb8..10aa028 100755 --- a/t/t7600-merge.sh +++ b/t/t7600-merge.sh @@ -502,7 +502,7 @@ test_expect_success 'option --ff-only overwrites --no-ff' ' test_must_fail git merge --no-ff --ff-only c2 ' -test_expect_success 'option --ff-only overwrites merge.ff=only config' ' +test_expect_success 'option --no-ff overrides merge.ff=only config' ' git reset --hard c0 && test_config merge.ff only && git merge --no-ff c1 -- 1.8.3.4-985-g5661af8