$manlookup

git-merge-index

(1)

Run a merge for files needing merging

User commands3 optionsgit-man 1:2.47.3-0+deb13u1
git merge-index [-o] [-q] <merge-program> (-a | ( [--] <file>...) )

Options

3
-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.

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.

GIT

Part of the git(1) suite