You cannot combine --squash with --no-ff

When I cut off the branch and went to master to git merge --squash<branch name>, I got an error You cannot combine --squash with --no-ff..

I think I understand the difference between --squash and --no-ff, but when I searched for this error statement, I couldn't find a specific solution.

Please teach me.

git

2022-09-30 11:45

1 Answers

I checked the gitconfig configuration and found that ff=false in the merge item.

This response was posted as a community wiki based on @Shioji Ryohei's comment.

2022-09-30 11:45

If you have any answers or tips

Popular Tags

python x 4647

android x 1593

java x 1494

javascript x 1427

c x 927

c++ x 878

ruby-on-rails x 696

php x 692

python3 x 685

html x 656