aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoremmett1 <emmett1.2miligrams@protonmail.com>2024-10-21 23:42:50 +0800
committeremmett1 <emmett1.2miligrams@protonmail.com>2024-10-21 23:42:50 +0800
commitc7adfd82db7270efefbc31e20fe06787de471169 (patch)
treef7b487e279aea11ab81151ee7abd5e2c2771c1e6
parent60c7ddac9d61ad4a45a8c256289d41a895d58f32 (diff)
downloadalicelinux-c7adfd82db7270efefbc31e20fe06787de471169.tar.gz
alicelinux-c7adfd82db7270efefbc31e20fe06787de471169.zip
git: updated to 2.47.0
-rw-r--r--repos/core/git/.checksum2
-rw-r--r--repos/core/git/.files1
-rw-r--r--repos/core/git/abuild2
3 files changed, 3 insertions, 2 deletions
diff --git a/repos/core/git/.checksum b/repos/core/git/.checksum
index 0f82c983..e4b1debc 100644
--- a/repos/core/git/.checksum
+++ b/repos/core/git/.checksum
@@ -1 +1 @@
-124d009520c5248ea62d2922c88d746d85d37dee31827586e4979202ba3c4bc1 git-2.46.2.tar.xz
+1f242d0be67ff62cbe2cf194b528b6dc3aabfeb31752ff98582c2325d456dcef git-2.47.0.tar.xz
diff --git a/repos/core/git/.files b/repos/core/git/.files
index a9e3498d..495c50d8 100644
--- a/repos/core/git/.files
+++ b/repos/core/git/.files
@@ -201,6 +201,7 @@ drwxr-xr-x root/root usr/libexec/git-core/mergetools/
-rw-r--r-- root/root usr/libexec/git-core/mergetools/tkdiff
-rw-r--r-- root/root usr/libexec/git-core/mergetools/tortoisemerge
-rw-r--r-- root/root usr/libexec/git-core/mergetools/vimdiff
+-rw-r--r-- root/root usr/libexec/git-core/mergetools/vscode
-rw-r--r-- root/root usr/libexec/git-core/mergetools/winmerge
-rw-r--r-- root/root usr/libexec/git-core/mergetools/xxdiff
-rwxr-xr-x root/root usr/libexec/git-core/scalar
diff --git a/repos/core/git/abuild b/repos/core/git/abuild
index aa73c520..4b710ab3 100644
--- a/repos/core/git/abuild
+++ b/repos/core/git/abuild
@@ -1,5 +1,5 @@
name=git
-version=2.46.2
+version=2.47.0
release=1
source="https://www.kernel.org/pub/software/scm/$name/$name-$version.tar.xz"