git-merge-one-file(1) debian man page | unix.com

Debian Man Pages Latest Topics

Man Page: git-merge-one-file

Operating Environment: debian

Section: 1

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 1.7.10.4							    11/24/2012						      GIT-MERGE-ONE-FIL(1)
Related Man Pages
git-fmt-merge-msg(1) - linux
git-merge-file(1) - centos
git-merge-base(1) - centos
git-merge-index(1) - osx
git-merge-index(1) - xfree86
Similar Topics in the Unix Linux Community
Adding the individual columns of a matrix.
Installing Dash Shell on OS X Lion
How can I do this in VI editor?
A (ksh) Library For and From UNIX.com