diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-07-21 12:14:42 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-21 12:14:42 -0700 |
| commit | 59eb68aa2b4e52aa1d098e0d76c5130864ceff2e (patch) | |
| tree | 92a8885ec88a99c353cefd90c5af97601504a1fd /Documentation/git-merge-one-file.txt | |
| parent | 93310a40eb022a0e36e7c618921931d8ffc31fd1 (diff) | |
| download | git-59eb68aa2b4e52aa1d098e0d76c5130864ceff2e.tar.gz | |
Update my e-mail address
The old cox.net address is still getting mails from gitters.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 -------------- |