summaryrefslogtreecommitdiff
path: root/git
diff options
context:
space:
mode:
Diffstat (limited to 'git')
-rw-r--r--git/.footprint3
-rw-r--r--git/.md5sum4
-rw-r--r--git/Pkgfile2
3 files changed, 6 insertions, 3 deletions
diff --git a/git/.footprint b/git/.footprint
index 1dc3c52c1..b9246bb9e 100644
--- a/git/.footprint
+++ b/git/.footprint
@@ -176,6 +176,7 @@ drwxr-xr-x root/root usr/lib/git-core/
-rwxr-xr-x root/root usr/lib/git-core/git-verify-tag
-rwxr-xr-x root/root usr/lib/git-core/git-web--browse
-rwxr-xr-x root/root usr/lib/git-core/git-whatchanged
+-rwxr-xr-x root/root usr/lib/git-core/git-worktree
-rwxr-xr-x root/root usr/lib/git-core/git-write-tree
drwxr-xr-x root/root usr/lib/git-core/mergetools/
-rw-r--r-- root/root usr/lib/git-core/mergetools/araxis
@@ -200,6 +201,7 @@ drwxr-xr-x root/root usr/lib/git-core/mergetools/
-rw-r--r-- root/root usr/lib/git-core/mergetools/vimdiff
-rw-r--r-- root/root usr/lib/git-core/mergetools/vimdiff2
-rw-r--r-- root/root usr/lib/git-core/mergetools/vimdiff3
+-rw-r--r-- root/root usr/lib/git-core/mergetools/winmerge
-rw-r--r-- root/root usr/lib/git-core/mergetools/xxdiff
drwxr-xr-x root/root usr/lib/perl5/
drwxr-xr-x root/root usr/lib/perl5/5.18/
@@ -374,6 +376,7 @@ drwxr-xr-x root/root usr/man/man1/
-rw-r--r-- root/root usr/man/man1/git-verify-tag.1.gz
-rw-r--r-- root/root usr/man/man1/git-web--browse.1.gz
-rw-r--r-- root/root usr/man/man1/git-whatchanged.1.gz
+-rw-r--r-- root/root usr/man/man1/git-worktree.1.gz
-rw-r--r-- root/root usr/man/man1/git-write-tree.1.gz
-rw-r--r-- root/root usr/man/man1/git.1.gz
-rw-r--r-- root/root usr/man/man1/gitk.1.gz
diff --git a/git/.md5sum b/git/.md5sum
index 7356e8eca..0db39b6c8 100644
--- a/git/.md5sum
+++ b/git/.md5sum
@@ -1,3 +1,3 @@
7ca9909a1a8206510c0f4b4946b7d4d9 git
-fb2c5214f5dc90bad0a2abdd4c425df6 git-2.4.6.tar.xz
-712f9f565c86aaf984fa2a85789dcfa1 git-manpages-2.4.6.tar.xz
+f108b475a0aa30e9587be4295ab0bb09 git-2.5.0.tar.xz
+753041f267344fd950fdb0f9fed26fe8 git-manpages-2.5.0.tar.xz
diff --git a/git/Pkgfile b/git/Pkgfile
index ec9dc08c5..482d9269b 100644
--- a/git/Pkgfile
+++ b/git/Pkgfile
@@ -6,7 +6,7 @@
# Nice to have: tk
name=git
-version=2.4.6
+version=2.5.0
release=1
source=(https://www.kernel.org/pub/software/scm/git/git-{,manpages-}$version.tar.xz
git)

Generated by cgit