| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 1 | git-merge-one-file(1) |
| 2 | ===================== |
| 3 | |
| 4 | NAME |
| 5 | ---- |
| Junio C Hamano | 7c73c66 | 2007-01-19 00:37:50 | [diff] [blame^] | 6 | git-merge-one-file - The standard helper program to use with git-merge-index |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 7 | |
| 8 | |
| 9 | SYNOPSIS |
| 10 | -------- |
| 11 | 'git-merge-one-file' |
| 12 | |
| 13 | DESCRIPTION |
| 14 | ----------- |
| 15 | This is the standard helper program to use with "git-merge-index" |
| 16 | to resolve a merge after the trivial merge done with "git-read-tree -m". |
| 17 | |
| 18 | Author |
| 19 | ------ |
| 20 | Written by Linus Torvalds <torvalds@osdl.org>, |
| 21 | Junio C Hamano <junkio@cox.net> and Petr Baudis <pasky@suse.cz>. |
| 22 | |
| 23 | Documentation |
| 24 | -------------- |
| 25 | Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>. |
| 26 | |
| 27 | GIT |
| 28 | --- |
| 29 | Part of the gitlink:git[7] suite |
| 30 | |
