Skip to content

Files

Latest commit

 

History

History
21 lines (16 loc) · 387 Bytes

git-merge-one-file.adoc

File metadata and controls

21 lines (16 loc) · 387 Bytes

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

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