projects / thirdparty / git.git / blame
| Commit | Line | Data |
|---|---|---|
| 215a7ad1 JH |
1 | git-merge-one-file(1) |
| 2 | ===================== | |
| 2cf565c5 DG |
3 | |
| 4 | NAME | |
| 5 | ---- | |
| c3f0baac | 6 | git-merge-one-file - The standard helper program to use with git-merge-index |
| 2cf565c5 DG |
7 | |
| 8 | ||
| 9 | SYNOPSIS | |
| 10 | -------- | |
| 215a7ad1 | 11 | 'git-merge-one-file' |
| 2cf565c5 DG |
12 | |
| 13 | DESCRIPTION | |
| 14 | ----------- | |
| 215a7ad1 | 15 | This is the standard helper program to use with "git-merge-index" |
| 2cf565c5 DG |
16 | to resolve a merge after the trivial merge done with "git-read-tree -m". |
| 17 | ||
| 18 | Author | |
| 19 | ------ | |
| 3f971fc4 JH |
20 | Written by Linus Torvalds <torvalds@osdl.org>, |
| 21 | Junio C Hamano <junkio@cox.net> and Petr Baudis <pasky@suse.cz>. | |
| 2cf565c5 DG |
22 | |
| 23 | Documentation | |
| 24 | -------------- | |
| 25 | Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>. | |
| 26 | ||
| 27 | GIT | |
| 28 | --- | |
| 5162e697 | 29 | Part of the linkgit:git[7] suite |