1git-merge-one-file(1) 2===================== 3 4NAME 5---- 6git-merge-one-file - The standard helper program to use with git-merge-index 7 8 9SYNOPSIS 10-------- 11'git-merge-one-file' 12 13DESCRIPTION 14----------- 15This is the standard helper program to use with 'git-merge-index' 16to resolve a merge after the trivial merge done with 'git-read-tree -m'. 17 18Author 19------ 20Written by Linus Torvalds <torvalds@osdl.org>, 21Junio C Hamano <gitster@pobox.com> and Petr Baudis <pasky@suse.cz>. 22 23Documentation 24-------------- 25Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>. 26 27GIT 28--- 29Part of the linkgit:git[1] suite