ivuorinen/cheatsheet-tldr
1
0
Fork 0
mirror of https://github.com/ivuorinen/cheatsheet-tldr.git synced 2026-03-13 21:59:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update cheatsheets

Browse Source
This commit is contained in:
ivuorinen
2025-05-06 00:19:54 +00:00
parent e452860d9b
commit 7e39fb6df5
49 changed files with 132 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tldr/git-merge
View File

@@ -14,7 +14,7 @@ source: https://github.com/tldr-pages/tldr.git
- Edit the merge message:
`git merge --edit {{branch_name}}`
`git merge {{[-e|--edit]}} {{branch_name}}`
- Merge a branch and create a merge commit:
@@ -26,4 +26,4 @@ source: https://github.com/tldr-pages/tldr.git
- Merge using a specific strategy:
`git merge --strategy {{strategy}} --strategy-option {{strategy_option}} {{branch_name}}`
`git merge {{[-s|--strategy]}} {{strategy}} {{[-X|--strategy-option]}} {{strategy_option}} {{branch_name}}`