diff options
Diffstat (limited to 'third_party/git/Documentation/git-merge-one-file.txt')
-rw-r--r-- | third_party/git/Documentation/git-merge-one-file.txt | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/third_party/git/Documentation/git-merge-one-file.txt b/third_party/git/Documentation/git-merge-one-file.txt new file mode 100644 index 000000000000..04e803d5d336 --- /dev/null +++ b/third_party/git/Documentation/git-merge-one-file.txt @@ -0,0 +1,21 @@ +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 |