diff --git a/srcpkgs/git-scalar b/srcpkgs/git-scalar
new file mode 120000
index 00000000000..0899c2993da
--- /dev/null
+++ b/srcpkgs/git-scalar
@@ -0,0 +1 @@
+git
\ No newline at end of file
diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 38259d41166..40e0c0bf10f 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -1,6 +1,6 @@
 # Template file for 'git'
 pkgname=git
-version=2.37.3
+version=2.38.0
 revision=1
 hostmakedepends="asciidoc gettext perl pkg-config tk xmlto"
 makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel"
@@ -14,12 +14,13 @@ license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 changelog="https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/${version}.txt"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
-checksum=814641d7f61659cfbc17825d0462499ca1403e39ff53d76a8512050e6483e87a
+checksum=923eade26b1814de78d06bda8e0a9f5da8b7c4b304b3f9050ffb464f0310320a
 replaces="git-perl>=0"
 register_shell=/usr/bin/git-shell
 python_version=3
 
-subpackages="git-cvs git-svn gitk git-gui git-all git-libsecret git-netrc"
+subpackages="git-cvs git-svn gitk git-gui git-all git-libsecret git-netrc
+ git-scalar"
 
 do_configure() {
 	cat <<-EOF >config.mak
@@ -38,6 +39,9 @@ do_configure() {
 	GIT_PROVE_OPTS = $makejobs
 	# firstword (uname -m)
 	HOST_CPU = ${XBPS_TARGET_MACHINE%-musl}
+	# this flag will skip shipping unneeded symlinks
+	# those symlinks were kept for scripts written before 2010
+	SKIP_DASHED_BUILT_INS = Yes
 	EOF
 
 	if [ "$XBPS_TARGET_LIBC" = musl ]; then
@@ -51,8 +55,7 @@ do_configure() {
 }
 
 do_build() {
-	make ${makejobs}
-	make ${makejobs} -C Documentation man
+	make ${makejobs} all man
 	make ${makejobs} -C contrib/contacts all git-contacts.1
 	make ${makejobs} -C contrib/diff-highlight all
 	make ${makejobs} -C contrib/subtree all man
@@ -68,7 +71,7 @@ do_check() {
 }
 
 do_install() {
-	make DESTDIR=${DESTDIR} install install-doc
+	make DESTDIR=${DESTDIR} install install-man
 	vinstall contrib/completion/git-completion.bash 644 \
 		usr/share/bash-completion/completions git
 	vinstall contrib/completion/git-prompt.sh 644 usr/share/git
@@ -83,6 +86,16 @@ do_install() {
 	make -C contrib/credential/netrc DESTDIR=${DESTDIR} install
 }
 
+git-scalar_package() {
+	depends="git"
+	short_desc="Tool for managing large Git repositories"
+	pkg_install() {
+		vmove usr/bin/scalar
+		vmove usr/libexec/git-core/scalar
+		vmove usr/share/man/man1/scalar.1
+	}
+}
+
 git-cvs_package() {
 	depends="${sourcepkg}-${version}_${revision} cvs cvsps2 perl-DBD-SQLite"
 	short_desc+=" - CVS support"