| 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 | -------- | ||||
| Junio C Hamano | 15567bc | 2011-07-23 00:51:59 | [diff] [blame] | 11 | [verse] |
| Junio C Hamano | 1aa40d2 | 2010-01-21 17:46:43 | [diff] [blame] | 12 | 'git merge-one-file' |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 13 | |
| 14 | DESCRIPTION | ||||
| 15 | ----------- | ||||
| Junio C Hamano | 1aa40d2 | 2010-01-21 17:46:43 | [diff] [blame] | 16 | This is the standard helper program to use with 'git merge-index' |
| 17 | to resolve a merge after the trivial merge done with 'git read-tree -m'. | ||||
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 18 | |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 19 | GIT |
| 20 | --- | ||||
| Junio C Hamano | f7c042d | 2008-06-06 22:50:53 | [diff] [blame] | 21 | Part of the linkgit:git[1] suite |