Rechercher une page de manuel

git-merge-one-file

Langue: en

Autres versions - même langue

Version: 04/04/2009 (fedora - 04/07/09)

Section: 1 (Commandes utilisateur)

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.

Written by Linus Torvalds <torvalds@osdl.org>, Junio C Hamano <gitster@pobox.com> and Petr Baudis <pasky@suse.cz>.

Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.

Part of the git(1) suite