GIT\-MERGE\-ONE\-FIL

Section: Git Manual (1)
Updated: 10/30/2009
Index Return to Main Contents

NAME

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

git-merge-one-file

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.

Written by Linus Torvalds <m[blue]torvalds@osdl.orgm[][1]>, Junio C Hamano <m[blue]gitster@pobox.comm[][2]> and Petr Baudis <m[blue]pasky@suse.czm[][3]>.

Documentation by David Greaves, Junio C Hamano and the git-list <m[blue]git@vger.kernel.orgm[][4]>.

Part of the git(1) suite

1.

2.

3.

4.