GIT-MERGE-ONE-FIL(1)                                       Git Manual                                       GIT-MERGE-ONE-FIL(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 <torvaldsATosdl.org[1]>, Junio C Hamano <gitsterATpobox.com[2]> and Petr Baudis
       <paskyATsuse.cz[3]>.

DOCUMENTATION
       Documentation by David Greaves, Junio C Hamano and the git-list <gitATvger.org[4]>.

GIT
       Part of the git(1) suite

NOTES
        1. torvaldsATosdl.org
           mailto:torvaldsATosdl.org

        2. gitsterATpobox.com
           mailto:gitsterATpobox.com

        3. paskyATsuse.cz
           mailto:paskyATsuse.cz

        4. gitATvger.org
           mailto:gitATvger.org



Git 1.7.4.4                                                04/11/2011                                       GIT-MERGE-ONE-FIL(1)