2005-09-08 00:26:23 +00:00
|
|
|
git-merge-one-file(1)
|
|
|
|
=====================
|
2005-05-10 21:32:30 +00:00
|
|
|
|
|
|
|
NAME
|
|
|
|
----
|
2007-01-18 23:53:37 +00:00
|
|
|
git-merge-one-file - The standard helper program to use with git-merge-index
|
2005-05-10 21:32:30 +00:00
|
|
|
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
--------
|
2010-01-09 23:33:00 +00:00
|
|
|
'git merge-one-file'
|
2005-05-10 21:32:30 +00:00
|
|
|
|
|
|
|
DESCRIPTION
|
|
|
|
-----------
|
2010-01-09 23:33:00 +00:00
|
|
|
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'.
|
2005-05-10 21:32:30 +00:00
|
|
|
|
|
|
|
Author
|
|
|
|
------
|
2005-08-15 00:24:36 +00:00
|
|
|
Written by Linus Torvalds <torvalds@osdl.org>,
|
2008-07-21 19:14:42 +00:00
|
|
|
Junio C Hamano <gitster@pobox.com> and Petr Baudis <pasky@suse.cz>.
|
2005-05-10 21:32:30 +00:00
|
|
|
|
|
|
|
Documentation
|
|
|
|
--------------
|
|
|
|
Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
|
|
|
|
|
|
|
|
GIT
|
|
|
|
---
|
2008-06-06 07:07:32 +00:00
|
|
|
Part of the linkgit:git[1] suite
|