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
7       git-merge-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[1]>, Junio C Hamano
18       <gitster@pobox.com[2]> and Petr Baudis <pasky@suse.cz[3]>.
19

DOCUMENTATION

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

GIT

25       Part of the git(1) suite
26

NOTES

28        1. torvalds@osdl.org
29           mailto:torvalds@osdl.org
30
31        2. gitster@pobox.com
32           mailto:gitster@pobox.com
33
34        3. pasky@suse.cz
35           mailto:pasky@suse.cz
36
37        4. git@vger.kernel.org
38           mailto:git@vger.kernel.org
39
40
41
42Git 1.7.4.4                       04/11/2011              GIT-MERGE-ONE-FIL(1)