man git-merge-one-file (Commandes) - The standard helper program to use with "git-merge-index"

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".

Written by Linus Torvalds <torvalds@osdl.org>, Junio C Hamano <junkio@cox.net> 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(7) suite