git-merge-one-file(1) - Linux man page
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.
Author
Written by Linus Torvalds <torvalds@osdl.org [1] >, Junio C Hamano <gitster@pobox.com [2] > and Petr Baudis <pasky@suse.cz [3] >.
Documentation
Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org [4] >.
Git
Part of the git(1) suite