mirror of
https://github.com/ivuorinen/cheatsheet-tldr.git
synced 2026-02-21 22:51:09 +00:00
Update cheatsheets
This commit is contained in:
17
tldr/git-merge-tree
Normal file
17
tldr/git-merge-tree
Normal 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}}`
|
||||
Reference in New Issue
Block a user