X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=Documentation%2Fgit-merge-one-file.txt;h=dc8a96adb00c0b674e12e071a4a56f89bfe8583d;hb=4f66250df641362f381faae2aec439850a5a6e41;hp=f35d0e1b4560a4970e7423011b585e1ff7d538c1;hpb=90c88a698e8bf36ff5812a177f8b6c2f878f229c;p=git.git

diff --git a/Documentation/git-merge-one-file.txt b/Documentation/git-merge-one-file.txt
index f35d0e1b4..dc8a96adb 100644
--- a/Documentation/git-merge-one-file.txt
+++ b/Documentation/git-merge-one-file.txt
@@ -12,13 +12,13 @@ SYNOPSIS
 
 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
 --------------
@@ -26,4 +26,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel
 
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[1] suite