5 files changed, 12 insertions, 11 deletions
diff --git a/devel/git-base/Makefile b/devel/git-base/Makefile
index 70c2102529b..1ad90979fe7 100644
--- a/devel/git-base/Makefile
+++ b/devel/git-base/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.85 2021/03/10 16:58:05 jperkin Exp $
+# $NetBSD: Makefile,v 1.86 2021/03/31 08:04:21 adam Exp $
 
 .include "../../devel/git/Makefile.common"
 
 PKGNAME=	git-base-${GIT_VERSION}
-PKGREVISION=	1
 COMMENT=	GIT Tree History Storage Tool (base package)
 
 CONFLICTS+=	scmgit-base-[0-9]*
diff --git a/devel/git-base/PLIST b/devel/git-base/PLIST
index 2c492eec1cf..5f8521336b7 100644
--- a/devel/git-base/PLIST
+++ b/devel/git-base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.33 2021/03/10 16:58:05 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.34 2021/03/31 08:04:21 adam Exp $
 bin/git
 bin/git-cvsserver
 bin/git-receive-pack
@@ -237,6 +237,7 @@ share/locale/de/LC_MESSAGES/git.mo
 share/locale/el/LC_MESSAGES/git.mo
 share/locale/es/LC_MESSAGES/git.mo
 share/locale/fr/LC_MESSAGES/git.mo
+share/locale/id/LC_MESSAGES/git.mo
 share/locale/is/LC_MESSAGES/git.mo
 share/locale/it/LC_MESSAGES/git.mo
 share/locale/ko/LC_MESSAGES/git.mo
diff --git a/devel/git-base/distinfo b/devel/git-base/distinfo
index c7fbe590cf6..74958988a89 100644
--- a/devel/git-base/distinfo
+++ b/devel/git-base/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.106 2021/03/09 21:15:20 leot Exp $
+$NetBSD: distinfo,v 1.107 2021/03/31 08:04:21 adam Exp $
 
-SHA1 (git-2.30.2.tar.xz) = 76b3118428fe59dd95bf4fa918244a8396f32bea
-RMD160 (git-2.30.2.tar.xz) = 8679eea01784e38b1402e47695e78d72ed486381
-SHA512 (git-2.30.2.tar.xz) = 4f7e1c30f8eee849d1febeda872d56c60c5d051a31726505a4c7bab11b274d3a2ab5588f910b7b49c5c0ec5228a18457f705c7b66e8bbdf809d3c75c59032b7e
-Size (git-2.30.2.tar.xz) = 6329820 bytes
+SHA1 (git-2.31.1.tar.xz) = a66f98f88bf7734f8463446ac0735cee190da1dc
+RMD160 (git-2.31.1.tar.xz) = 98b31ed7a2d36160c99e924a4d9c9636af59c4f5
+SHA512 (git-2.31.1.tar.xz) = 9aa334a3e8519700ff5d112153ec42677722980094caa9d22aa91afdb65166bd9a98fa445c0d327c428ebfa73bf4832e9b3836109a1d9319feafe3191cfd170e
+Size (git-2.31.1.tar.xz) = 6413368 bytes
 SHA1 (patch-Documentation_Makefile) = 6025adac0fbb4b403f3954e6dac9d690dfb22daa
 SHA1 (patch-Makefile) = 73741b9d9a1b32bb47db48a7c546c4ff10fb41d6
 SHA1 (patch-config.mak.uname) = 5316873147acf5b6ef29e426946280bb6441c886
diff --git a/devel/git-docs/PLIST b/devel/git-docs/PLIST
index 5c63e3e811b..3204b567e87 100644
--- a/devel/git-docs/PLIST
+++ b/devel/git-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2021/01/11 10:20:16 adam Exp $
+@comment $NetBSD: PLIST,v 1.18 2021/03/31 08:04:21 adam Exp $
 man/man1/git-add.1
 man/man1/git-am.1
 man/man1/git-annotate.1
@@ -160,6 +160,7 @@ man/man3/Git.3pm
 man/man5/gitattributes.5
 man/man5/githooks.5
 man/man5/gitignore.5
+man/man5/gitmailmap.5
 man/man5/gitmodules.5
 man/man5/gitrepository-layout.5
 man/man5/gitweb.conf.5
diff --git a/devel/git/Makefile.version b/devel/git/Makefile.version
index e55cb8005ec..b59d38b2592 100644
--- a/devel/git/Makefile.version
+++ b/devel/git/Makefile.version
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.version,v 1.94 2021/03/09 21:15:19 leot Exp $
+# $NetBSD: Makefile.version,v 1.95 2021/03/31 08:04:21 adam Exp $
 #
 # used by devel/git/Makefile.common
 # used by devel/git-cvs/Makefile
 # used by devel/git-svn/Makefile
 
-GIT_VERSION=	2.30.2
+GIT_VERSION=	2.31.1