suse man page for git-merge-one-file

Suse Man Pages All Man Pages Latest Topics Forum Categories

Query: git-merge-one-file

OS: suse

Section: 1

Format: Original Unix Latex Style Formatted with HTML and a Horizontal Scroll Bar

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							    07/05/2010						      GIT-MERGE-ONE-FIL(1)
Related Man Pages
git-cherry(1) - suse
git-lost-found(1) - suse
git-ls-tree(1) - suse
git-mailsplit(1) - suse
git-merge-index(1) - suse
Similar Topics in the Unix Linux Community
Change directory error
Migrating to UNIX
SOCKS proxy &amp; PAM configuration exposure
The Future of the PM (Private Message) System at UNIX.com
32 bit process addressing more than 4GB