diff --git a/devel/git/Makefile b/devel/git/Makefile
index 7ced284e7..e0f3b7861 100644
--- a/devel/git/Makefile
+++ b/devel/git/Makefile
@@ -2,7 +2,7 @@ COMMENT-main =	distributed version control system
 COMMENT-svn =	subversion interoperability tools
 COMMENT-x11 =	graphical tools
 
-V =		2.46.0
+V =		2.48.1
 DISTNAME =	git-${V}
 CATEGORIES =	devel
 
@@ -113,6 +113,10 @@ TEST_ENV =		GIT_TEST_OPTS=${GIT_TEST_OPTS:Q} \
 # one expensive test needs explicit enabling
 TEST_ENV +=		GIT_TEST_CLONE_2GB=true
 
+# XXX with 2.48.0 'make fake' failed due to missing asiidoc.conf
+# add the target generating it for now
+ALL_TARGET =		all man
+
 post-extract:
 	@mkdir -p ${WRKSRC}/doc
 	${TAR} -C ${WRKSRC}/doc -xzf ${FULLDISTDIR}/${DOC_DISTFILE}
diff --git a/devel/git/distinfo b/devel/git/distinfo
index 7079da8f9..cdc90866d 100644
--- a/devel/git/distinfo
+++ b/devel/git/distinfo
@@ -1,4 +1,4 @@
-SHA256 (git-2.46.0.tar.gz) = sTiBHhaDj2aaJRbkDwnVBQDhx/xUG1q1DOhLmFheUjA=
-SHA256 (git-manpages-2.46.0.tar.gz) = obGFMxHXNMokL8shY81X2Oi0lWPNF809CAz8pS9p3rU=
-SIZE (git-2.46.0.tar.gz) = 11242129
-SIZE (git-manpages-2.46.0.tar.gz) = 987724
+SHA256 (git-2.48.1.tar.gz) = UbTQOx4xG6ZzWRIQ+U8kpMV4FFPh6xiIIuPZzcBMIhI=
+SHA256 (git-manpages-2.48.1.tar.gz) = iHQkZpJtPWgr5SFEcK6St5poeWqdFx05N2Oldn3lpYE=
+SIZE (git-2.48.1.tar.gz) = 11457025
+SIZE (git-manpages-2.48.1.tar.gz) = 998141
diff --git a/devel/git/patches/patch-builtin_gc_c b/devel/git/patches/patch-builtin_gc_c
index 308074d2f..ab738cc28 100644
--- a/devel/git/patches/patch-builtin_gc_c
+++ b/devel/git/patches/patch-builtin_gc_c
@@ -3,7 +3,7 @@ Replace sysctl HW_PHYSMEM/MEMSIZE/whatever madness with sysconf.
 Index: builtin/gc.c
 --- builtin/gc.c.orig
 +++ builtin/gc.c
-@@ -312,20 +312,13 @@ static uint64_t total_ram(void)
+@@ -369,20 +369,13 @@ static uint64_t total_ram(void)
  
  	if (!sysinfo(&si))
  		return si.totalram;
diff --git a/devel/git/patches/patch-config_mak_uname b/devel/git/patches/patch-config_mak_uname
index 4312baf0c..2186a78e0 100644
--- a/devel/git/patches/patch-config_mak_uname
+++ b/devel/git/patches/patch-config_mak_uname
@@ -1,12 +1,17 @@
+OpenBSD wants DIR_HAS_BSD_GROUP_SEMANTICS, just like FreeBSD
+
 Index: config.mak.uname
 --- config.mak.uname.orig
 +++ config.mak.uname
-@@ -292,7 +292,7 @@ ifeq ($(uname_S),FreeBSD)
+@@ -293,9 +293,8 @@ ifeq ($(uname_S),FreeBSD)
  	FREAD_READS_DIRECTORIES = UnfortunatelyYes
  	FILENO_IS_A_MACRO = UnfortunatelyYes
  endif
 -ifeq ($(uname_S),OpenBSD)
+-	NO_STRCASESTR = YesPlease
+-	NO_MEMMEM = YesPlease
 +ifeq ($(uname_S),SecBSD)
- 	NO_STRCASESTR = YesPlease
- 	NO_MEMMEM = YesPlease
++	DIR_HAS_BSD_GROUP_SEMANTICS = YesPlease
  	USE_ST_TIMESPEC = YesPlease
+ 	NEEDS_LIBICONV = YesPlease
+ 	BASIC_CFLAGS += -I/usr/local/include
diff --git a/devel/git/pkg/PLIST-main b/devel/git/pkg/PLIST-main
index 2f6dad9c2..0a6ace5ca 100644
--- a/devel/git/pkg/PLIST-main
+++ b/devel/git/pkg/PLIST-main
@@ -213,6 +213,7 @@ libexec/git/mergetools/smerge
 libexec/git/mergetools/tkdiff
 libexec/git/mergetools/tortoisemerge
 libexec/git/mergetools/vimdiff
+libexec/git/mergetools/vscode
 libexec/git/mergetools/winmerge
 libexec/git/mergetools/xxdiff
 @bin libexec/git/scalar
@@ -412,13 +413,10 @@ libexec/git/mergetools/xxdiff
 @man man/man7/gittutorial.7
 @man man/man7/gitworkflows.7
 share/doc/pkg-readmes/${PKGSTEM}
-share/emacs/
-share/emacs/site-lisp/
 share/emacs/site-lisp/git-blame.el
 share/emacs/site-lisp/git.el
 share/git-core/
 share/git-core/templates/
-share/git-core/templates/branches/
 share/git-core/templates/description
 share/git-core/templates/hooks/
 share/git-core/templates/hooks/applypatch-msg.sample