Merge branch 'aw/git-p4-deletion' into maint

[git.git] / Documentation / git-merge-one-file.txt

diff --git a/Documentation/git-merge-one-file.txt b/Documentation/git-merge-one-file.txt
index 1dd134538da40a1f3547c55c49be3b418e6be0ab..a163cfca6993b61b3f3d198bd0980bd1fed37e52 100644 (file)
--- a/Documentation/git-merge-one-file.txt
+++ b/Documentation/git-merge-one-file.txt
@@ -8,17 +8,17 @@ git-merge-one-file - The standard helper program to use with git-merge-index
 
 SYNOPSIS
 --------
-'git-merge-one-file'
+'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'.
+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>.
+Junio C Hamano <gitster@pobox.com> and Petr Baudis <pasky@suse.cz>.
 
 Documentation
 --------------