Bagas Sanjaya wrote: > On 12/07/21 00.07, Felipe Contreras wrote: > > The advice clearly says it should be possible to override pull.ff=only > > with --rebase: > > > > You can also pass --rebase, --no-rebase, or --ff-only on the command > > line to override the configured default per invocation. > > > > Since the intended behavior of `git pull` is very easily forgotten let's > > add a test to make sure it isn't. > > > > Is pull.ff=only only do fast-forward merge when pulling? Only when the pull is a merge pull (although there are proposals to change that). > > +test_expect_success 'pull allows non-fast-forward with "only" in pull.ff if --rebase' ' > > + git reset --hard c1 && > > + test_config pull.ff only && > > + git pull --rebase . c3 > > +' > > + > > Better say 'pull allows non-fast-forward (using --rebase) regardless of > pull.ff=only config' In English parentheses are used for stuff that isn't essential (i.e. optional). If you remove what is inside the parenthesis the title loses the most important part, so I don't think that's an improvement. Cheers. -- Felipe Contreras
