Git merge

From NovaOrdis Knowledge Base
Jump to navigation Jump to search

Internal

Overview

Options

--no-ff

Create a merge commit even when the merge resolves as a fast-forward. This is the default behaviour when merging an annotated tag. This is also the default behavior when merging GitHub pull requests with "Create a merge commit" option.