diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-12-10 12:22:42 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-12-10 12:22:42 +0300 |
| commit | 7be2b6e02b4f2a1b4812764f65b12cafb11a934e (patch) | |
| tree | c94ad7eb3a4d478a1c71eb6ef0aaf1c0f7348660 /Documentation/git.txt | |
| parent | c07a07c588fea82c2426d795a75324b3035c0a71 (diff) | |
| parent | 591aa2536fdbc4090ba8d4ca512d4ee7df4bf05d (diff) | |
Merge branch 'master' into cc/help
This is to primarily pull in MANPATH tweak and help.txt formatting fix
from the master branch.
Diffstat (limited to 'Documentation/git.txt')
| -rw-r--r-- | Documentation/git.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git.txt b/Documentation/git.txt index c4e4d24ea4..a29b634e7a 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -541,7 +541,7 @@ Authors ------- * git's founding father is Linus Torvalds <torvalds@osdl.org>. * The current git nurse is Junio C Hamano <gitster@pobox.com>. -* The git potty was written by Andres Ericsson <ae@op5.se>. +* The git potty was written by Andreas Ericsson <ae@op5.se>. * General upbringing is handled by the git-list <git@vger.kernel.org>. Documentation |