Flags available for the git merge command.
git merge
These flags control how Git performs the merge operation.
--no-ff
--ff-only
--squash
--no-commit
--commit
--edit
--no-edit
--strategy=ours
--strategy=recursive
Git.merge
Flags available for the
git mergecommand.These flags control how Git performs the merge operation.
--no-ff: Disables fast-forward merges.--ff-only: Only allows fast-forward merges.--squash: Combines changes into a single commit without a merge.--no-commit: Prevents an automatic commit after merge.--commit: Forces a commit if merge is successful.--edit: Opens the commit message editor after merging.--no-edit: Uses the default commit message without editing.--strategy=ours: Uses 'ours' strategy to favor current branch.--strategy=recursive: Uses the default recursive merge strategy.