lilith/tldr
1
0
Fork 0
mirror of https://github.com/tldr-pages/tldr.git synced 2025-08-13 11:35:42 +02:00
Code Activity

git-merge: add --no-ff example

Browse source 
Include an example and brief description of the --no-ff option
This commit is contained in:
Dillon Flamand 2018-04-02 16:59:41 -07:00 • committed by Agniva De Sarker
parent 4aa6a324be
commit 4bd7a1da17
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pages/common/git-merge.md
View file

@ -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}}`