mirror of https://github.com/CrimsonTome/tldr.git
git-merge: add --no-ff example
Include an example and brief description of the --no-ff optionitalian
parent
4aa6a324be
commit
4bd7a1da17
|
@ -9,3 +9,7 @@
|
||||||
- Edit the merge message:
|
- Edit the merge message:
|
||||||
|
|
||||||
`git merge -e {{branch_name}}`
|
`git merge -e {{branch_name}}`
|
||||||
|
|
||||||
|
- Merge a branch and create a merge commit:
|
||||||
|
|
||||||
|
`git merge --no-ff {{branch_name}}`
|
||||||
|
|
Loading…
Reference in New Issue