mirror of
https://github.com/git/git.git
synced 2024-11-06 09:13:01 +01:00
3f971fc425
Linus brought up that documentation for many commands have incorrect attribution. I started counting lines again, but ended up adding a handful of missing manual pages. Signed-off-by: Junio C Hamano <junkio@cox.net>
31 lines
676 B
Text
31 lines
676 B
Text
git-merge-one-file-script(1)
|
|
============================
|
|
v0.99.4, Aug 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>,
|
|
Junio C Hamano <junkio@cox.net> and Petr Baudis <pasky@suse.cz>.
|
|
|
|
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
|
|
|