HEX
Server: LiteSpeed
System: Linux w5304130.sdnsbox.com 4.18.0-425.3.1.lve.el8.x86_64 #1 SMP Tue Nov 22 22:59:23 EST 2022 x86_64
User: makefitmeserver (1001)
PHP: 8.2.30
Disabled: NONE
Upload Files
File: //usr/share/doc/git/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