diff options
author | Junio C Hamano <gitster@pobox.com> | 2020-02-14 20:42:29 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-02-14 20:42:29 (GMT) |
commit | 8dbeba198ee6759874bb68a74131d1d3adfd75ea (patch) | |
tree | 5041cd5ea45698c9ac4eb1d26e1b7a8aab627e78 /.mailmap | |
parent | e361f36f61b664a36db1d34c3f9e3427ac42656d (diff) | |
parent | 7210ca4ee551011b8d7d3ae55c011c4703f07743 (diff) | |
download | git-8dbeba198ee6759874bb68a74131d1d3adfd75ea.zip git-8dbeba198ee6759874bb68a74131d1d3adfd75ea.tar.gz git-8dbeba198ee6759874bb68a74131d1d3adfd75ea.tar.bz2 |
Merge branch 'ds/sparse-cone' into maint
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-- | .mailmap | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -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> |