1GIT-MERGE-ONE-FIL(1)              Git Manual              GIT-MERGE-ONE-FIL(1)
2
3
4

NAME

6       git-merge-one-file - The standard helper program to use with git-merge-
7       index
8

SYNOPSIS

10       git-merge-one-file
11

DESCRIPTION

13       This is the standard helper program to use with "git-merge-index" to
14       resolve a merge after the trivial merge done with "git-read-tree -m".
15

AUTHOR

17       Written by Linus Torvalds <torvalds@osdl.org>, Junio C Hamano
18       <junkio@cox.net> and Petr Baudis <pasky@suse.cz>.
19

DOCUMENTATION

21       Documentation by David Greaves, Junio C Hamano and the git-list
22       <git@vger.kernel.org>.
23

GIT

25       Part of the git(7) suite
26
27
28
29
30Git 1.5.3.3                       10/09/2007              GIT-MERGE-ONE-FIL(1)