git merge-index
Run a merge program on files that need merging. More information: https://git-scm.com/docs/git-merge-index.
- Merge all files needing resolution using the standard helper:
git merge-index git-merge-one-file -a
- Merge a specific file:
git merge-index git-merge-one-file --
- Merge multiple files, continuing on failures:
git merge-index -o git-merge-one-file --
- Quietly merge all files with a custom program:
git merge-index -q -a
- Inspect merge inputs for a file using
cat:
git merge-index cat --
来源:tldr-pages contributors · 作者与贡献记录 · CC BY 4.0。离线整理了版式、链接和媒体显示。
