Manual Reference Pages  - GIT-MERGE-ONE-FIL (1)


.ds Aq ’

NAME

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

CONTENTS

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 1.7.10.4 GIT-MERGE-ONE-FIL (1) 11/24/2012
blog comments powered by Disqus