GIT-MERGE-ONE-FILE(1) Git Manual 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".
AUTHOR
Written by Linus Torvalds <torvalds@osdl.org>, Junio C Hamano
<junkio@cox.net> and Petr Baudis <pasky@suse.cz>.
DOCUMENTATION
Documentation by David Greaves, Junio C Hamano and the git-list
<git@vger.kernel.org>.
GIT
Part of the git(7) suite
Git 1.5.5.6 01/12/2009 GIT-MERGE-ONE-FILE(1)
