diff options
| author | Michael Forney <mforney@mforney.org> | 2020-03-22 18:42:25 -0700 |
|---|---|---|
| committer | Michael Forney <mforney@mforney.org> | 2020-03-24 14:01:41 -0700 |
| commit | 85ac5c8eb7ffce5e720d6cc594109555ce36071f (patch) | |
| tree | 232d071ef2b99997cc7cf1652d5e1b129e0af4a2 | |
| parent | 0e57a5de27f143751703d683a4629050ae599628 (diff) | |
git: Update to 2.26.0
| -rw-r--r-- | pkg/git/.gitignore | 2 | ||||
| -rw-r--r-- | pkg/git/config.h | 2 | ||||
| -rw-r--r-- | pkg/git/gen.lua | 1 | ||||
| -rw-r--r-- | pkg/git/man.txt | 2 | ||||
| -rw-r--r-- | pkg/git/sha256 | 2 | ||||
| m--------- | pkg/git/src | 0 | ||||
| -rw-r--r-- | pkg/git/url | 2 | ||||
| -rw-r--r-- | pkg/git/ver | 2 |
8 files changed, 7 insertions, 6 deletions
diff --git a/pkg/git/.gitignore b/pkg/git/.gitignore index 95c9d569..e610b34e 100644 --- a/pkg/git/.gitignore +++ b/pkg/git/.gitignore @@ -1,3 +1,3 @@ -/git-manpages-2.25.2.tar.xz +/git-manpages-2.26.0.tar.xz /man /man.ninja diff --git a/pkg/git/config.h b/pkg/git/config.h index 491a07ec..df02506d 100644 --- a/pkg/git/config.h +++ b/pkg/git/config.h @@ -11,7 +11,7 @@ #define GIT_LOCALE_PATH "/share/locale" #define GIT_MAN_PATH "share/man" #define GIT_USER_AGENT "git/" GIT_VERSION -#define GIT_VERSION "2.25.2" +#define GIT_VERSION "2.26.0" #define HAVE_ALLOCA_H #define HAVE_PATHS_H #define HAVE_DEV_TTY diff --git a/pkg/git/gen.lua b/pkg/git/gen.lua index 5e16e304..14f7a627 100644 --- a/pkg/git/gen.lua +++ b/pkg/git/gen.lua @@ -154,6 +154,7 @@ lib('libgit.a', [[ range-diff.c reachable.c read-cache.c + rebase.c rebase-interactive.c ref-filter.c reflog-walk.c diff --git a/pkg/git/man.txt b/pkg/git/man.txt index 6cc03bfe..7cd85a08 100644 --- a/pkg/git/man.txt +++ b/pkg/git/man.txt @@ -1,4 +1,4 @@ -# 2,<xzcat git-manpages-2.25.2.tar.xz | pax -s '/\.\///' '*.[1-9]' | sort +# 2,<xzcat git-manpages-2.26.0.tar.xz | pax -s '/\.\///' '*.[1-9]' | sort man1/git-add.1 man1/git-am.1 man1/git-annotate.1 diff --git a/pkg/git/sha256 b/pkg/git/sha256 index d3ee9cae..018bc3ff 100644 --- a/pkg/git/sha256 +++ b/pkg/git/sha256 @@ -1 +1 @@ -78bbe92b0c7c2f9a227025a7b7207951c185adda38a968499e5b6dacb6e1d41a git-manpages-2.25.2.tar.xz +387e46a0b67c148be7ef80759b1930a3b64ac77782630c18afc784f35ed93426 git-manpages-2.26.0.tar.xz diff --git a/pkg/git/src b/pkg/git/src -Subproject 0822e66b5d49d0de1aa767b38785e42de05eaf4 +Subproject 274b9cc25322d9ee79aa8e6d4e86f0ffe5ced92 diff --git a/pkg/git/url b/pkg/git/url index e00aeed8..e4c51d64 100644 --- a/pkg/git/url +++ b/pkg/git/url @@ -1 +1 @@ -url = "https://www.kernel.org/pub/software/scm/git/git-manpages-2.25.2.tar.xz" +url = "https://www.kernel.org/pub/software/scm/git/git-manpages-2.26.0.tar.xz" diff --git a/pkg/git/ver b/pkg/git/ver index 130c8e0f..69a5d833 100644 --- a/pkg/git/ver +++ b/pkg/git/ver @@ -1 +1 @@ -2.25.2 r0 +2.26.0 r0 |