Update cheatsheets

This commit is contained in:
ivuorinen
2025-10-21 00:19:51 +00:00
parent c3f5e8d7ab
commit 8d00ec1c41
29 changed files with 728 additions and 15 deletions

17
tldr/git-merge-tree Normal file
View File

@@ -0,0 +1,17 @@
---
syntax: markdown
tags: [tldr, common]
source: https://github.com/tldr-pages/tldr.git
---
# git merge-tree
> Merge branches without changing files.
> More information: <https://git-scm.com/docs/git-merge-tree>.
- Show the result of a merge between two branches:
`git merge-tree {{branch1}} {{branch2}}`
- Perform a merge and write the resulting tree:
`git merge-tree --write-tree {{branch1}} {{branch2}}`