Documentation: sync git.txt command list and manual page title
[git/git.git] / Documentation / git-merge-one-file.txt
CommitLineData
215a7ad1
JH
1git-merge-one-file(1)
2=====================
2cf565c5
DG
3
4NAME
5----
c3f0baac 6git-merge-one-file - The standard helper program to use with git-merge-index
2cf565c5
DG
7
8
9SYNOPSIS
10--------
215a7ad1 11'git-merge-one-file'
2cf565c5
DG
12
13DESCRIPTION
14-----------
215a7ad1 15This is the standard helper program to use with "git-merge-index"
2cf565c5
DG
16to resolve a merge after the trivial merge done with "git-read-tree -m".
17
18Author
19------
3f971fc4
JH
20Written by Linus Torvalds <torvalds@osdl.org>,
21Junio C Hamano <junkio@cox.net> and Petr Baudis <pasky@suse.cz>.
2cf565c5
DG
22
23Documentation
24--------------
25Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
26
27GIT
28---
a7154e91 29Part of the gitlink:git[7] suite
2cf565c5 30