1. NAME

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

2. SYNOPSIS



git merge-one-file

3. 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.

4. AUTHOR



Written by Linus Torvalds <\m[blue]\ \fR\m[]\s-2\u[1]\d\s+2>, Junio C Hamano <\m[blue]\ \fR\m[]\s-2\u[2]\d\s+2> and Petr Baudis <\m[blue]\ \fR\m[]\s-2\u[3]\d\s+2>.

5. DOCUMENTATION



Documentation by David Greaves, Junio C Hamano and the git-list <\m[blue]\ \fR\m[]\s-2\u[4]\d\s+2>.

6. GIT



Part of the git(1) suite

7. NOTES

1. 4
mailto:

2. 4
mailto:

3. 4
mailto:

4. 4
mailto: