From mboxrd@z Thu Jan 1 00:00:00 1970 From: smithj4 at bnl.gov (Jason A. Smith) Date: Tue, 24 Oct 2017 10:55:21 -0400 Subject: [PATCH 0/3] Add support for git's mailmap. In-Reply-To: <7b18e5bf-635b-7773-e352-c9a54ab46a20@bnl.gov> References: <7b18e5bf-635b-7773-e352-c9a54ab46a20@bnl.gov> Message-ID: <2219e113-66c7-e0a1-664a-d160d43449d6@bnl.gov> Seeing a lot of recent activity I checked the upstream and see that the patch I first submitted over a year ago has still not been merged. I already had to rebase it once several months ago to fix conflicts, I don't want to have to do that again. Is there something wrong with this patch? Please let me know so I can fix it. Thanks, ~Jason On 02/24/2017 11:18 AM, Jason A. Smith wrote: > > Rebased patch to resolve some minor conflicts with the master branch. > > Jason A. Smith (1): > ? Add support for git's mailmap. > > John Keeping (2): > ? filter: introduce cgit_open_email_filter() wrapper > ? Remove angle brackets from {author,committer}_email > > ?cgit.h????? |? 5 +++++ > ?filter.c??? | 13 +++++++++++++ > ?parsing.c?? | 27 ++++++++++++++++++++++----- > ?ui-atom.c?? | 31 ++++++++++++++----------------- > ?ui-commit.c | 28 ++++++++++++++++++++-------- > ?ui-log.c??? | 11 +++++++++-- > ?ui-refs.c?? | 32 ++++++++++++++++++++++++++------ > ?ui-stats.c? | 13 ++++++++++--- > ?ui-tag.c??? | 17 ++++++++++++----- > ?9 files changed, 131 insertions(+), 46 deletions(-) >