GIT\-MERGE\-INDEXSection: Git Manual (1)
Index Return to Main Contents
NAMEgit-merge-index - Run a merge for files needing merging
SYNOPSISgit-merge-index [-o] [-q] <merge-program> (-a | -- | <file>*)
DESCRIPTIONThis looks up the <file>(s) in the index and, if there are any merge entries, passes the SHA1 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.
- Do not interpret any more arguments as options.
- Run merge against all files in the index that need merging.
- 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 are over.
- Do not complain about failed merge program (the merge program failure usually indicates conflicts during merge). This is for porcelains which might want to emit custom messages.
Typically this is run with the 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.
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
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
AUTHORWritten by Linus Torvalds <email@example.com> One-shot merge by Petr Baudis <firstname.lastname@example.org>
DOCUMENTATIONDocumentation by David Greaves, Junio C Hamano and the git-list <email@example.com>.
GITPart of the git(7) suite