1GIT-MERGE-INDEX(1)                Git Manual                GIT-MERGE-INDEX(1)
2
3
4

NAME

6       git-merge-index - Run a merge for files needing merging
7

SYNOPSIS

9       git merge-index [-o] [-q] <merge-program> (-a | [--] <file>*)
10

DESCRIPTION

12       This looks up the <file>(s) in the index and, if there are any merge
13       entries, passes the SHA-1 hash for those files as arguments 1, 2, 3
14       (empty argument if no file), and <file> as argument 4. File modes for
15       the three files are passed as arguments 5, 6 and 7.
16

OPTIONS

18       --
19           Do not interpret any more arguments as options.
20
21       -a
22           Run merge against all files in the index that need merging.
23
24       -o
25           Instead of stopping at the first failed merge, do all of them in
26           one shot - continue with merging even when previous merges returned
27           errors, and only return the error code after all the merges.
28
29       -q
30           Do not complain about a failed merge program (a merge program
31           failure usually indicates conflicts during the merge). This is for
32           porcelains which might want to emit custom messages.
33
34       If git merge-index is called with multiple <file>s (or -a) then it
35       processes them in turn only stopping if merge returns a non-zero exit
36       code.
37
38       Typically this is run with a script calling Git’s imitation of the
39       merge command from the RCS package.
40
41       A sample script called git merge-one-file is included in the
42       distribution.
43
44       ALERT ALERT ALERT! The Git "merge object order" is different from the
45       RCS merge program merge object order. In the above ordering, the
46       original is first. But the argument order to the 3-way merge program
47       merge is to have the original in the middle. Don’t ask me why.
48
49       Examples:
50
51           torvalds@ppc970:~/merge-test> git merge-index cat MM
52           This is MM from the original tree.              # original
53           This is modified MM in the branch A.            # merge1
54           This is modified MM in the branch B.            # merge2
55           This is modified MM in the branch B.            # current contents
56
57       or
58
59           torvalds@ppc970:~/merge-test> git merge-index cat AA MM
60           cat: : No such file or directory
61           This is added AA in the branch A.
62           This is added AA in the branch B.
63           This is added AA in the branch B.
64           fatal: merge program failed
65
66       where the latter example shows how git merge-index will stop trying to
67       merge once anything has returned an error (i.e., cat returned an error
68       for the AA file, because it didn’t exist in the original, and thus git
69       merge-index didn’t even try to merge the MM thing).
70

GIT

72       Part of the git(1) suite
73
74
75
76Git 2.31.1                        2021-03-26                GIT-MERGE-INDEX(1)
Impressum