GIT-MERGE-ONE-FIL
Section: Git Manual (1)
Updated: 09/22/2011
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 <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
Documentation by David Greaves, Junio C Hamano and the git-list <m[blue]git@vger.kernel.orgm[][4]>.
GIT
Part of the git(1) suite
NOTES
- 1.
-
torvalds@osdl.org
-
mailto:torvalds@osdl.org
- 2.
-
gitster@pobox.com
-
mailto:gitster@pobox.com
- 3.
-
pasky@suse.cz
-
mailto:pasky@suse.cz
- 4.
-
git@vger.kernel.org
-
mailto:git@vger.kernel.org
Index
- NAME
-
- SYNOPSIS
-
- DESCRIPTION
-
- AUTHOR
-
- DOCUMENTATION
-
- GIT
-
- NOTES
-
This document was created by
man2html,
using the manual pages.
Time: 07:36:01 GMT, March 26, 2013