English ▾
Localized versions of git-merge-tree manual
Topics ▾
Email
Version 2.0.5
▾
git-merge-tree last updated in 2.46.0
Changes in the git-merge-tree manual
Setup and Config
Getting and Creating Projects
Basic Snapshotting
Branching and Merging
Sharing and Updating Projects
Inspection and Comparison
Patching
Debugging
External Systems
Server Admin
Guides
- gitattributes
- Command-line interface conventions
- Everyday Git
- Frequently Asked Questions (FAQ)
- Glossary
- Hooks
- gitignore
- gitmodules
- Revisions
- Submodules
- Tutorial
- Workflows
- All guides...
Administration
Plumbing Commands
- 2.46.1 → 2.47.0 no changes
-
2.46.0
07/29/24
- 2.45.1 → 2.45.2 no changes
-
2.45.0
04/29/24
- 2.43.1 → 2.44.2 no changes
-
2.43.0
11/20/23
- 2.41.1 → 2.42.3 no changes
-
2.41.0
06/01/23
- 2.40.1 → 2.40.3 no changes
-
2.40.0
03/12/23
- 2.39.1 → 2.39.5 no changes
-
2.39.0
12/12/22
- 2.38.1 → 2.38.5 no changes
-
2.38.0
10/02/22
- 2.1.4 → 2.37.7 no changes
-
2.0.5
12/17/14
DESCRIPTION
Reads three tree-ish, and output trivial merge results and conflicting stages to the standard output. This is similar to what three-way git read-tree -m does, but instead of storing the results in the index, the command outputs the entries to the standard output.
This is meant to be used by higher level scripts to compute merge results outside of the index, and stuff the results back into the index. For this reason, the output from the command omits entries that match the <branch1> tree.
GIT
Part of the git[1] suite
