summaryrefslogtreecommitdiff
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.txt31
1 files changed, 31 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..b84d14d
--- /dev/null
+++ b/Documentation/git-merge-one-file.txt
@@ -0,0 +1,31 @@
+git-merge-one-file(1)
+=====================
+v0.99.4, Aug 2005
+
+NAME
+----
+git-merge-one-file - The standard helper program to use with "git-merge-index"
+
+
+SYNOPSIS
+--------
+'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".
+
+Author
+------
+Written by Linus Torvalds <torvalds@osdl.org>,
+Junio C Hamano <junkio@cox.net> and Petr Baudis <pasky@suse.cz>.
+
+Documentation
+--------------
+Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
+
+GIT
+---
+Part of the link:git.html[git] suite
+