diff options
| author | Juergen Daubert <jue@jue.li> | 2016-12-13 13:41:38 +0100 |
|---|---|---|
| committer | Juergen Daubert <jue@jue.li> | 2016-12-13 13:41:38 +0100 |
| commit | d01c4855f3e8b4acb30283d5e5ed03df2009be99 (patch) | |
| tree | 207f4985ca6efab2852967d19d786ff1109aa9b9 /git | |
| parent | 83b563b0faced43a6991dd90869fb1d9fbfb62be (diff) | |
| parent | 386d93bd54e8823d5e4b7c63f18a590162c111e9 (diff) | |
| download | opt-d01c4855f3e8b4acb30283d5e5ed03df2009be99.tar.gz opt-d01c4855f3e8b4acb30283d5e5ed03df2009be99.tar.xz | |
Merge branch '3.2' into 3.3
Diffstat (limited to 'git')
| -rw-r--r-- | git/.footprint | 3 | ||||
| -rw-r--r-- | git/.md5sum | 4 | ||||
| -rw-r--r-- | git/Pkgfile | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/git/.footprint b/git/.footprint index 27f3624e4..070570c57 100644 --- a/git/.footprint +++ b/git/.footprint @@ -243,7 +243,7 @@ drwxr-xr-x root/root usr/share/git-core/templates/hooks/ -rwxr-xr-x root/root usr/share/git-core/templates/hooks/pre-commit.sample -rwxr-xr-x root/root usr/share/git-core/templates/hooks/pre-push.sample -rwxr-xr-x root/root usr/share/git-core/templates/hooks/pre-rebase.sample --rw-r--r-- root/root usr/share/git-core/templates/hooks/pre-receive.sample +-rwxr-xr-x root/root usr/share/git-core/templates/hooks/pre-receive.sample -rwxr-xr-x root/root usr/share/git-core/templates/hooks/prepare-commit-msg.sample -rwxr-xr-x root/root usr/share/git-core/templates/hooks/update.sample drwxr-xr-x root/root usr/share/git-core/templates/info/ @@ -286,6 +286,7 @@ drwxr-xr-x root/root usr/share/git-gui/lib/msgs/ -rw-r--r-- root/root usr/share/git-gui/lib/msgs/ja.msg -rw-r--r-- root/root usr/share/git-gui/lib/msgs/nb.msg -rw-r--r-- root/root usr/share/git-gui/lib/msgs/pt_br.msg +-rw-r--r-- root/root usr/share/git-gui/lib/msgs/pt_pt.msg -rw-r--r-- root/root usr/share/git-gui/lib/msgs/ru.msg -rw-r--r-- root/root usr/share/git-gui/lib/msgs/sv.msg -rw-r--r-- root/root usr/share/git-gui/lib/msgs/vi.msg diff --git a/git/.md5sum b/git/.md5sum index ee82fec36..f249c7cde 100644 --- a/git/.md5sum +++ b/git/.md5sum @@ -1,3 +1,3 @@ b423b29027071b520ed95af5639c16d5 git -3cd1dca37be60668f482545716923b72 git-2.10.2.tar.xz -6dc2a09d58a7aea20329b56a1efcb058 git-manpages-2.10.2.tar.xz +dd4e3360e28aec5bb902fb34dd7fce3b git-2.11.0.tar.xz +72718851626e5b2267877cc2194a1ac9 git-manpages-2.11.0.tar.xz diff --git a/git/Pkgfile b/git/Pkgfile index b3780975c..2f3a227a0 100644 --- a/git/Pkgfile +++ b/git/Pkgfile @@ -6,7 +6,7 @@ # Nice to have: tk name=git -version=2.10.2 +version=2.11.0 release=1 source=(https://www.kernel.org/pub/software/scm/git/git-{,manpages-}$version.tar.xz git) |