git-merge-index
Run a merge program on files that need merging. tldr-pages
On several platforms
Several platforms
Merge all files needing resolution using the standard helper
git merge-index git-merge-one-file -aIdentifyMerge a specific file
git merge-index git-merge-one-file -- path/to/fileIdentifyMerge multiple files, continuing on failures
git merge-index -o git-merge-one-file -- path/to/file1 path/to/file2 ...IdentifyQuietly merge all files with a custom program
git merge-index -q merge_program -aIdentifyInspect merge inputs for a file using cat
git merge-index cat -- pathIdentify