git-merge-one-file (1)

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

Information

Source
Git
OS/version
Git 2.20.0
Source updated
December 2, 2018
Page created
February 25, 2018
Page generated
December 2, 2018