diff options
Diffstat (limited to 'Documentation/git-merge-one-file.txt')
| -rw-r--r-- | Documentation/git-merge-one-file.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-merge-one-file.txt b/Documentation/git-merge-one-file.txt index 1dd134538d..dc8a96adb0 100644 --- a/Documentation/git-merge-one-file.txt +++ b/Documentation/git-merge-one-file.txt @@ -18,7 +18,7 @@ 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 -------------- |