Permalink
Cannot retrieve contributors at this time
Name already in use
A tag already exists with the provided branch name. Many Git commands accept both tag and branch names, so creating this branch may cause unexpected behavior. Are you sure you want to create this branch?
git/Documentation/git-merge-one-file.txt
Go to fileThis commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
21 lines (16 sloc)
387 Bytes
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| git-merge-one-file(1) | |
| ===================== | |
| NAME | |
| ---- | |
| git-merge-one-file - The standard helper program to use with git-merge-index | |
| SYNOPSIS | |
| -------- | |
| [verse] | |
| 'git merge-one-file' | |
| DESCRIPTION | |
| ----------- | |
| This is the standard helper program to use with 'git merge-index' | |
| to resolve a merge after the trivial merge done with 'git read-tree -m'. | |
| GIT | |
| --- | |
| Part of the linkgit:git[1] suite |