[thirdparty/git.git] / Documentation / git-merge-one-file.txt

git-merge-one-file(1)
=====================

NAME
----
git-merge-one-file - The standard helper program to use with git-merge-index


SYNOPSIS
--------
[verse]
'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'.

GIT
---
Part of the linkgit:git[1] suite
Commit	Line	Data
	1	git-merge-one-file(1)
	2	=====================
	3
	4	NAME
	5	----
	6	git-merge-one-file - The standard helper program to use with git-merge-index
	7
	8
	9	SYNOPSIS
	10	--------
	11	[verse]
	12	'git merge-one-file'
	13
	14	DESCRIPTION
	15	-----------
	16	This is the standard helper program to use with 'git merge-index'
	17	to resolve a merge after the trivial merge done with 'git read-tree -m'.
	18
	19	GIT
	20	---
	21	Part of the linkgit:git[1] suite