www.LinuxHowtos.org
GIT\-MERGE\-ONE\-FIL
Section: Git Manual (1)Updated: 11/29/2016
Index Return to Main Contents
NAME
git-merge-one-file - The standard helper program to use with git-merge-indexSYNOPSIS
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