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