git-merge-one-file man page on OpenBSD
Man page or keyword search:  
man Server   11362 pages
apropos Keyword Search (all sections)
Output format
OpenBSD logo
[printable version] 


GIT-MERGE-ONE-FILE(1)			    GIT-MERGE-ONE-FILE(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:   mailto:tor-
       valds@osdl.org>,	 Junio	C   Hamano   <gitster@pobox.com:   mailto:git-
       ster@pobox.com>	and Petr Baudis <pasky@suse.cz: mailto:pasky@suse.cz>.

DOCUMENTATION
       Documentation by	 David	Greaves,  Junio	 C  Hamano  and	 the  git-list
       <git@vger.kernel.org: mailto:git@vger.kernel.org>.

GIT
       Part of the git(1) suite

								1
[top]

List of man pages available for OpenBSD

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