]>
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 | -------- | |
0b444cdb | 11 | 'git merge-one-file' |
2cf565c5 DG |
12 | |
13 | DESCRIPTION | |
14 | ----------- | |
0b444cdb TR |
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'. | |
2cf565c5 DG |
17 | |
18 | Author | |
19 | ------ | |
3f971fc4 | 20 | Written by Linus Torvalds <torvalds@osdl.org>, |
59eb68aa | 21 | Junio C Hamano <gitster@pobox.com> 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 | --- | |
9e1f0a85 | 29 | Part of the linkgit:git[1] suite |