GIT-MERGE-ONE-FILE(1) Git Manual GIT-MERGE-ONE-FILE(1)

# [NAME](#NAME)

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

# [SYNOPSIS](#SYNOPSIS)

```
git merge-one-file
```

# [DESCRIPTION](#DESCRIPTION)

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

# [GIT](#GIT)

Part of the [**git**(1)](/man/os/git/git.1) suite

2026-09-28 Git 2.56.0.1.gaef21129

---

Document: git-merge-one-file(1) from git 2.56.0-r2 (Chainguard OS)
Source: https://kernel.googlesource.com/pub/scm/git/git.git