diff options
| author | Fredrik Rinnestam <fredrik@crux.nu> | 2020-10-24 17:40:06 +0200 |
|---|---|---|
| committer | Fredrik Rinnestam <fredrik@crux.nu> | 2020-10-24 17:40:06 +0200 |
| commit | 8593ff0f67bb2fd0fb240a6b4e3bee81fecbd4df (patch) | |
| tree | 16910135f9b7d35b488655ddf661d1f9385d9ebf /git | |
| parent | c68e000a61d28ddc2dc77a34705639c9d1090da5 (diff) | |
| parent | 9ff49b1b9800ff61b16d9cda229c17d520359ca7 (diff) | |
| download | opt-8593ff0f67bb2fd0fb240a6b4e3bee81fecbd4df.tar.gz opt-8593ff0f67bb2fd0fb240a6b4e3bee81fecbd4df.tar.xz | |
Merge branch '3.5' into 3.6
Diffstat (limited to 'git')
| -rw-r--r-- | git/.footprint | 8 | ||||
| -rw-r--r-- | git/.signature | 10 | ||||
| -rw-r--r-- | git/Pkgfile | 2 |
3 files changed, 8 insertions, 12 deletions
diff --git a/git/.footprint b/git/.footprint index 1d4c0e685..fa2859241 100644 --- a/git/.footprint +++ b/git/.footprint @@ -138,7 +138,6 @@ drwxr-xr-x root/root usr/lib/git-core/ -rwxr-xr-x root/root usr/lib/git-core/git-remote-ftps -rwxr-xr-x root/root usr/lib/git-core/git-remote-http -rwxr-xr-x root/root usr/lib/git-core/git-remote-https --rwxr-xr-x root/root usr/lib/git-core/git-remote-testsvn -rwxr-xr-x root/root usr/lib/git-core/git-repack -rwxr-xr-x root/root usr/lib/git-core/git-replace -rwxr-xr-x root/root usr/lib/git-core/git-request-pull @@ -189,7 +188,6 @@ drwxr-xr-x root/root usr/lib/git-core/ drwxr-xr-x root/root usr/lib/git-core/mergetools/ -rw-r--r-- root/root usr/lib/git-core/mergetools/araxis -rw-r--r-- root/root usr/lib/git-core/mergetools/bc --rw-r--r-- root/root usr/lib/git-core/mergetools/bc3 -rw-r--r-- root/root usr/lib/git-core/mergetools/codecompare -rw-r--r-- root/root usr/lib/git-core/mergetools/deltawalker -rw-r--r-- root/root usr/lib/git-core/mergetools/diffmerge @@ -199,19 +197,16 @@ drwxr-xr-x root/root usr/lib/git-core/mergetools/ -rw-r--r-- root/root usr/lib/git-core/mergetools/examdiff -rw-r--r-- root/root usr/lib/git-core/mergetools/guiffy -rw-r--r-- root/root usr/lib/git-core/mergetools/gvimdiff --rw-r--r-- root/root usr/lib/git-core/mergetools/gvimdiff2 --rw-r--r-- root/root usr/lib/git-core/mergetools/gvimdiff3 -rw-r--r-- root/root usr/lib/git-core/mergetools/kdiff3 -rw-r--r-- root/root usr/lib/git-core/mergetools/kompare -rw-r--r-- root/root usr/lib/git-core/mergetools/meld +-rw-r--r-- root/root usr/lib/git-core/mergetools/nvimdiff -rw-r--r-- root/root usr/lib/git-core/mergetools/opendiff -rw-r--r-- root/root usr/lib/git-core/mergetools/p4merge -rw-r--r-- root/root usr/lib/git-core/mergetools/smerge -rw-r--r-- root/root usr/lib/git-core/mergetools/tkdiff -rw-r--r-- root/root usr/lib/git-core/mergetools/tortoisemerge -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/ @@ -406,6 +401,7 @@ drwxr-xr-x root/root usr/share/man/man1/ -rw-r--r-- root/root usr/share/man/man1/git-ls-tree.1.gz -rw-r--r-- root/root usr/share/man/man1/git-mailinfo.1.gz -rw-r--r-- root/root usr/share/man/man1/git-mailsplit.1.gz +-rw-r--r-- root/root usr/share/man/man1/git-maintenance.1.gz -rw-r--r-- root/root usr/share/man/man1/git-merge-base.1.gz -rw-r--r-- root/root usr/share/man/man1/git-merge-file.1.gz -rw-r--r-- root/root usr/share/man/man1/git-merge-index.1.gz diff --git a/git/.signature b/git/.signature index f4b9d103c..b02621568 100644 --- a/git/.signature +++ b/git/.signature @@ -1,8 +1,8 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/TodubPnDhp3wqoOetP3b3zeeZ+RUwU6N6E7jy3NSbnBD82R4x3DCgaOVvVtMVpr2qBR1bzxsqg0A7HgnJdfmAo= -SHA256 (Pkgfile) = 37d6f644381c99ce04104480d84f649e2e77ba0777af4d1a5e44429993263a03 -SHA256 (.footprint) = 1a5bb14cbdc7343ae8a765d16b167e8ef550dca0c74e8525c00f5f59a9e5d112 -SHA256 (git-2.28.0.tar.xz) = dfa5d1a253aa451465478fe45c6a40ab8605b340fdb4c4e80b16d7f87708439d -SHA256 (git-manpages-2.28.0.tar.xz) = 665a7fa41f9a39248e48422dcf533e1a0133a4a6eddfc25ee55e28e42fc07cb7 +RWSE3ohX2g5d/f7rNIJYe6ijgOpRZTbMhXQd2POhMY+YFpPfwDmIwIiUBE3imiPxZUECYTcByIBMwDg8ppHK2aLMytp7O7GBhw0= +SHA256 (Pkgfile) = 2a7507484c386921100855bdfb99feb204eba68cab84d9692a4e3eb14e434819 +SHA256 (.footprint) = 26ab0bbc23a95cbc400bdf4abef881767012e3d2ea7db2b7c02f77dee8f4cf4a +SHA256 (git-2.29.1.tar.xz) = 3005609697d0dd61699d86b533f4db873da82e80804cbb55111b2e330114adb3 +SHA256 (git-manpages-2.29.1.tar.xz) = d3c7958aea93106d974ecf2516636270676679d8fcbff540e6ee398c2074c7be SHA256 (git) = 432108f8c5f5abeb429cab25181b43ee42060d46fa7fbe7e4b02790b56f61e8a SHA256 (gitd.rc) = 3a7a13fcfbf493890e58a3c1c8a71de08518b35fa6fe6109120a03cd8beeac25 diff --git a/git/Pkgfile b/git/Pkgfile index ec8488fb6..8cadebe7a 100644 --- a/git/Pkgfile +++ b/git/Pkgfile @@ -5,7 +5,7 @@ # Optional: tk name=git -version=2.28.0 +version=2.29.1 release=1 source=(https://www.kernel.org/pub/software/scm/git/git-{,manpages-}$version.tar.xz git gitd.rc) |