summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-01-30 22:17:08 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-01-30 22:17:08 (GMT)
commit043426c8fd58bfa1b897828309363a864d547458 (patch)
tree5e32da2accab3603c556e66d274cb04726c7f28e /.mailmap
parent34246a1a3ca7eb50229e93b0dda799f0abe92cc4 (diff)
parent7210ca4ee551011b8d7d3ae55c011c4703f07743 (diff)
downloadgit-043426c8fd58bfa1b897828309363a864d547458.zip
git-043426c8fd58bfa1b897828309363a864d547458.tar.gz
git-043426c8fd58bfa1b897828309363a864d547458.tar.bz2
Merge branch 'ds/sparse-cone'
The code recently added in this release to move to the entry beyond the ones in the same directory in the index in the sparse-cone mode did not count the number of entries to skip over incorrectly, which has been corrected. * ds/sparse-cone: .mailmap: fix GGG authoship screwup unpack-trees: correctly compute result count
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap1
1 files changed, 1 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index fbef813..7d8e2b0 100644
--- a/.mailmap
+++ b/.mailmap
@@ -59,6 +59,7 @@ David S. Miller <davem@davemloft.net>
David Turner <novalis@novalis.org> <dturner@twopensource.com>
David Turner <novalis@novalis.org> <dturner@twosigma.com>
Derrick Stolee <dstolee@microsoft.com> <stolee@gmail.com>
+Derrick Stolee <dstolee@microsoft.com> Derrick Stolee via GitGitGadget <gitgitgadget@gmail.com>
Deskin Miller <deskinm@umich.edu>
Đoàn Trần Công Danh <congdanhqx@gmail.com> Doan Tran Cong Danh
Dirk Süsserott <newsletter@dirk.my1.cc>