git/Documentation/git-merge-one-file-script.txt
David Greaves 2cf565c53c [PATCH 1/4] split core-git.txt and update
Split the core-git.txt file
Formatting fix to the diff-format.txt

Signed-off-by: David Greaves <david@dgreaves.com>
2005-05-10 14:55:22 -07:00

31 lines
607 B
Plaintext

git-merge-one-file-script(1)
============================
v0.1, May 2005
NAME
----
git-merge-one-file-script - The standard helper program to use with "git-merge-cache"
SYNOPSIS
--------
'git-merge-one-file-script'
DESCRIPTION
-----------
This is the standard helper program to use with "git-merge-cache"
to resolve a merge after the trivial merge done with "git-read-tree -m".
Author
------
Written by Linus Torvalds <torvalds@osdl.org>
Documentation
--------------
Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
GIT
---
Part of the link:git.html[git] suite