summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-one-file.txt
blob: 62e09afe13d48393b7dc2a734b416e5302088654 (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
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>,
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 linkgit:git[1] suite