table of contents
other versions
- wheezy 1:1.7.10.4-1+wheezy3
- wheezy-backports 1:1.9.1-1~bpo70+2
- jessie 1:2.1.4-2.1+deb8u2
- jessie-backports 1:2.11.0-3~bpo8+1
- testing 1:2.11.0-3
- unstable 1:2.11.0-4
- experimental 1:2.13.1+next.20170610-1
GIT-MERGE-INDEX(1) | Git Manual | GIT-MERGE-INDEX(1) |
NAME¶
git-merge-index - Run a merge for files needing mergingSYNOPSIS¶
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 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.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.
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
GIT¶
Part of the git(1) suite03/19/2016 | Git 1.7.10.4 |