git-merge-one-file(1) - BetterMan

git-merge-one-file(1)

The standard helper program to use with git-merge-index

distropkg git-man@1:2.47.3-0+deb13u1dataset 2026-04-01T06:19:02Z+debian+ec4110e+mandoc:1.14.6-4

Synopsis

git merge-one-file

—

NAME

git-merge-one-file - The standard helper program to use with git-merge-index

bash

git merge-one-file

This is the standard helper program to use with git merge-index to resolve a merge after the trivial merge done with git read-tree -m.

Part of the git(1) suite