Git merge: Difference between revisions
Jump to navigation
Jump to search
| Line 2: | Line 2: | ||
* [[Git_Commands#Branch_Operations|Git Commands]] | * [[Git_Commands#Branch_Operations|Git Commands]] | ||
* [[Git Merging]] | |||
=Overview= | =Overview= | ||
Revision as of 21:27, 7 August 2019
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.