Git merge: Difference between revisions
Jump to navigation
Jump to search
| Line 7: | Line 7: | ||
==--no-ff== | ==--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. | Create a merge commit even when the merge resolves as a [[Git_Concepts#Fast-Forward|fast-forward]]. This is the default behaviour when merging an annotated tag. | ||
Revision as of 19:48, 17 April 2018
Internal
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.