git-merge-one-file(1) - phpMan

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 <torvalds AT osdl.org[1]>, Junio C Hamano <gitster AT pobox.com[2]>
       and Petr Baudis <pasky AT suse.cz[3]>.


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


GIT
       Part of the git(1) suite


NOTES
        1. torvalds AT osdl.org
           mailto:torvalds AT osdl.org

        2. gitster AT pobox.com
           mailto:gitster AT pobox.com

        3. pasky AT suse.cz
           mailto:pasky AT suse.cz

        4. git AT vger.org
           mailto:git AT vger.org



Git 1.7.1.1                                 06/30/2010                       GIT-MERGE-ONE-FIL(1)

Generated by $Id: phpMan.php,v 4.49 2006/02/26 13:18:18 chedong Exp $ Author: Che Dong
On Apache
Under GNU General Public License
2012-05-25 19:12 @38.107.179.240 Crawled by CCBot/1.0 (+http://www.commoncrawl.org/bot.html)