diff options
author | Junio C Hamano <gitster@pobox.com> | 2007-12-10 01:22:42 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2007-12-10 01:22:42 -0800 |
commit | 7be2b6e02b4f2a1b4812764f65b12cafb11a934e (patch) | |
tree | c94ad7eb3a4d478a1c71eb6ef0aaf1c0f7348660 /.mailmap | |
parent | c07a07c588fea82c2426d795a75324b3035c0a71 (diff) | |
parent | 591aa2536fdbc4090ba8d4ca512d4ee7df4bf05d (diff) | |
download | git-7be2b6e02b4f2a1b4812764f65b12cafb11a934e.tar.gz git-7be2b6e02b4f2a1b4812764f65b12cafb11a934e.tar.xz |
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 '.mailmap')
-rw-r--r-- | .mailmap | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -6,6 +6,7 @@ # Aneesh Kumar K.V <aneesh.kumar@gmail.com> +Brian M. Carlson <sandals@crustytoothpaste.ath.cx> Chris Shoemaker <c.shoemaker@cox.net> Dana L. How <danahow@gmail.com> Dana L. How <how@deathvalley.cswitch.com> |