mirror of
https://github.com/git/git.git
synced 2024-11-06 01:03:02 +01:00
98438bd0e8
Signed-off-by: Christian Meder <chris@absolutegiganten.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
30 lines
626 B
Text
30 lines
626 B
Text
git-merge-one-file(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".
|
|
|
|
Author
|
|
------
|
|
Written by Linus Torvalds <torvalds@osdl.org>,
|
|
Junio C Hamano <junkio@cox.net> and Petr Baudis <pasky@suse.cz>.
|
|
|
|
Documentation
|
|
--------------
|
|
Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
|
|
|
|
GIT
|
|
---
|
|
Part of the gitlink:git[7] suite
|
|
|