Go to main content

man pages section 1: User Commands

Exit Print View

Updated: Wednesday, February 10, 2021
 
 

git-merge-one-file (1)

Name

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

Synopsis

git merge-one-file

Description

GIT-MERGE-ONE-FIL(1)              Git Manual              GIT-MERGE-ONE-FIL(1)



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

SYNOPSIS
       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 git(1) suite



Git 2.15.2                        05/29/2018              GIT-MERGE-ONE-FIL(1)