summaryrefslogtreecommitdiffstats
path: root/Documentation/git-merge-one-file.txt
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation/git-merge-one-file.txt')
-rw-r--r--Documentation/git-merge-one-file.txt21
1 files changed, 21 insertions, 0 deletions
diff --git a/Documentation/git-merge-one-file.txt b/Documentation/git-merge-one-file.txt
new file mode 100644
index 0000000..04e803d
--- /dev/null
+++ b/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