Content - 04e803d5d3362c97e92efc22bdec4fe526946c6f - 8b09a2c/Documentation/git-merge-one-file.txt

Staging
v0.8.1

visit type:

https://github.com/git/git

23 January 2022, 05:21:09 UTC

Tip revision: 98cdfbb84ad2ed6a2eb43dafa357a70a4b0a0fad authored by Junio C Hamano on 21 November 2018, 14:22:12 UTC
Git 2.19.2

Tip revision: 98cdfbb

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