[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
215a7ad1 JH	1	git-merge-one-file(1)
215a7ad1 JH	2	=====================
2cf565c5 DG	3
	4	NAME
	5	----
c3f0baac	6	git-merge-one-file - The standard helper program to use with git-merge-index
2cf565c5 DG	7
	8
	9	SYNOPSIS
	10	--------
7791a1d9	11	[verse]
0b444cdb	12	'git merge-one-file'
2cf565c5 DG	13
	14	DESCRIPTION
	15	-----------
0b444cdb TR	16	This is the standard helper program to use with 'git merge-index'
0b444cdb TR	17	to resolve a merge after the trivial merge done with 'git read-tree -m'.
2cf565c5	18
2cf565c5 DG	19	GIT
2cf565c5 DG	20	---
9e1f0a85	21	Part of the linkgit:git[1] suite