www.LinuxHowtos.org howtos, tips&tricks and tutorials for linux

from small one page howto to huge articles all in one place

poll results

Last additions:

words:

887

views:

206178

userrating:

average rating: 1.5 (158 votes) (1=very good 6=terrible)

May 25th. 2007:

Words

486

Views

257023

words:

161

views:

147629

userrating:

average rating: 1.2 (114 votes) (1=very good 6=terrible)

April, 26th. 2006:

Words

Views

105892

You are here: manpages

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-index

git merge-one-file

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.

Part of the git(1) suite

- Powered by

- Running on