GIT-MERGE-TREE(1) Git Manual GIT-MERGE-TREE(1)NAME
git-merge-tree - Show three-way merge without touching index
SYNOPSIS
git merge-tree <base-tree> <branch1> <branch2>
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
Git 1.8.5.3 01/14/2014 GIT-MERGE-TREE(1)
Check Out this Related Man Page
GIT-MERGE-INDEX(1) Git Manual GIT-MERGE-INDEX(1)NAME
git-merge-index - Run a merge for files needing merging
SYNOPSIS
git merge-index [-o] [-q] <merge-program> (-a | [--] <file>*)
DESCRIPTION
This looks up the <file>(s) in the index and, if there are any merge entries, passes the SHA-1 hash for those files as arguments 1, 2, 3
(empty argument if no file), and <file> as argument 4. File modes for the three files are passed as arguments 5, 6 and 7.
OPTIONS --
Do not interpret any more arguments as options.
-a
Run merge against all files in the index that need merging.
-o
Instead of stopping at the first failed merge, do all of them in one shot - continue with merging even when previous merges returned
errors, and only return the error code after all the merges.
-q
Do not complain about a failed merge program (a merge program failure usually indicates conflicts during the merge). This is for
porcelains which might want to emit custom messages.
If git merge-index is called with multiple <file>s (or -a) then it processes them in turn only stopping if merge returns a non-zero exit
code.
Typically this is run with a script calling Git's imitation of the merge command from the RCS package.
A sample script called git merge-one-file is included in the distribution.
ALERT ALERT ALERT! The Git "merge object order" is different from the RCS merge program merge object order. In the above ordering, the
original is first. But the argument order to the 3-way merge program merge is to have the original in the middle. Don't ask me why.
Examples:
torvalds@ppc970:~/merge-test> git merge-index cat MM
This is MM from the original tree. # original
This is modified MM in the branch A. # merge1
This is modified MM in the branch B. # merge2
This is modified MM in the branch B. # current contents
or
torvalds@ppc970:~/merge-test> git merge-index cat AA MM
cat: : No such file or directory
This is added AA in the branch A.
This is added AA in the branch B.
This is added AA in the branch B.
fatal: merge program failed
where the latter example shows how git merge-index will stop trying to merge once anything has returned an error (i.e., cat returned an
error for the AA file, because it didn't exist in the original, and thus git merge-index didn't even try to merge the MM thing).
GIT
Part of the git(1) suite
Git 1.8.5.3 01/14/2014 GIT-MERGE-INDEX(1)
The UNIX and Linux Forums have a number of active members that have published books or papers related to shell programming and scripting. You can check out their publications here:
Link Removed
Please note, as you can imagine, our forum experts can be quite busy! You will get a response... (0 Replies)
Emergency UNIX and Linux Support !! Help Me! Forum (Request Urgent Help)
README FIRST: How to Request Emergency or Urgent Help:
You may post emergency work-related questions in the emergency forum. To post in this forum you will need to use your Bits. All questions answered on a "best... (0 Replies)
Homework Help:
On Posting Questions:
Any and all high school and undergraduate homework assignments or textbook style exercises for which you are seeking assistance are to be posted only in our Homework & Coursework Questions area--not in blogs, visitor messages, PMs, or the main technical... (0 Replies)
Dear Forum Members,
The UNIX and Linux Forums are working directly with the Red Cross to provide ad banners on our site to support Earthquake and Tsunami Relief in Japan. Registered users do not see these banners. However, if you wish to contribute directly on behalf of yourself and the... (8 Replies)
How to Use Code Tags in The UNIX and Linux Forums
Developer: This video tutorial was created by scott for forum users. Everyone should use code tags when posting code and command line logic in the forums.
cPF45jjWe7Q
A full list of BB codes is available here. (8 Replies)
RULES OF THE UNIX AND LINUX FORUMS
For the latest version of the community rules (the official community rules page), please visit here.
No flames, shouting (all caps), sarcasm, bullying, profanity or arrogant posts.
No negative comments about others or impolite remarks. Be patient. No... (1 Reply)
I see lot of ad-hoc shell scripts in our servers which don't have a shebang at the beginning .
Does this mean that it will run on any shell ?
Is it a good practice to create scripts (even ad-hoc ones) without shebang ? (16 Replies)
Having spent a lot of time over the past year taking a legacy vBulletin site (this forum) and making the site responsive on mobile; I've happy with the results; but it will soon be time to move on.
Basically, at our core, we are a LAMP (Linux, Apache2, MySQL and PHP) site, and vBulletin was... (6 Replies)
Here are some answers to some of the recent questions I have received about UNIX.COM. So, I thought I would take time to answer them here in this post:
Is it expected that the original poster "thank" everyone who responds to his / her discussion thread?
It is always a good practice in all... (7 Replies)
By special request, and long overdue, I have updated our "code tags" video and so now we have:
How to Use Code Tags and Format Posts @UNIX.com in 4K
https://youtu.be/4BuPvWJV__k (3 Replies)
Here is a quick EOY report for 2019.
2019 has been a year of "downward trend reversal" for UNIX.com. In fact, if we compare total Google search impressions from the peak days in December 2019 to the peak days in mid December 2018, traffic is up 43% percent. That is a very respectable growth... (0 Replies)