Linux Blog

GIT\-MERGE\-ONE\-FILE

Section: Git Manual (1)
Updated: 09/30/2007
Index Return to Main Contents
 

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

 

Index

NAME
SYNOPSIS
DESCRIPTION
AUTHOR
DOCUMENTATION
GIT