aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-merge-one-file-script.txt
blob: 1cfe9548e149b401b8b58fe324211f58d58e6874 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
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