git-merge-one-file man page on Mandriva

Man page or keyword search:  
man Server   17060 pages
apropos Keyword Search (all sections)
Output format
Mandriva logo
[printable version]

GIT-MERGE-ONE-FIL(1)		  Git Manual		  GIT-MERGE-ONE-FIL(1)

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

DOCUMENTATION
       Documentation by David Greaves, Junio C Hamano and the git-list
       <git@vger.kernel.org[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

Git 1.7.1			  12/16/2010		  GIT-MERGE-ONE-FIL(1)
[top]

List of man pages available for Mandriva

Copyright (c) for man pages and the logo by the respective OS vendor.

For those who want to learn more, the polarhome community provides shell access and support.

[legal] [privacy] [GNU] [policy] [cookies] [netiquette] [sponsors] [FAQ]
Tweet
Polarhome, production since 1999.
Member of Polarhome portal.
Based on Fawad Halim's script.
....................................................................
Vote for polarhome
Free Shell Accounts :: the biggest list on the net