NAME

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

SYNOPSIS

git merge-one-file
 

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

Part of the git(1) suite

Recommended readings

Pages related to git-merge-one-file you should read also:
git(1)

Questions & Answers

Helpful answers and articles about git-merge-one-file you may found on these sites:
Stack Overflow Server Fault Super User Unix & Linux Ask Ubuntu Network Engineering DevOps Raspberry Pi Webmasters Google Search