git: 2.33.1 -> 2.34.0

3 files changed, 47 insertions, 49 deletions

diff --git a/git/.footprint b/git/.footprint
index 7a0185ce0..6d7534624 100644
--- a/git/.footprint
+++ b/git/.footprint
@@ -8,11 +8,11 @@ drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/git
 -rwxr-xr-x	root/root	usr/bin/git-cvsserver
+-rwxr-xr-x	root/root	usr/bin/gitk
 -rwxr-xr-x	root/root	usr/bin/git-receive-pack
 -rwxr-xr-x	root/root	usr/bin/git-shell
 -rwxr-xr-x	root/root	usr/bin/git-upload-archive
 -rwxr-xr-x	root/root	usr/bin/git-upload-pack
--rwxr-xr-x	root/root	usr/bin/gitk
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/git-core/
 -rwxr-xr-x	root/root	usr/lib/git-core/git
@@ -33,10 +33,10 @@ drwxr-xr-x	root/root	usr/lib/git-core/
 -rwxr-xr-x	root/root	usr/lib/git-core/git-check-attr
 -rwxr-xr-x	root/root	usr/lib/git-core/git-check-ignore
 -rwxr-xr-x	root/root	usr/lib/git-core/git-check-mailmap
--rwxr-xr-x	root/root	usr/lib/git-core/git-check-ref-format
 -rwxr-xr-x	root/root	usr/lib/git-core/git-checkout
--rwxr-xr-x	root/root	usr/lib/git-core/git-checkout--worker
 -rwxr-xr-x	root/root	usr/lib/git-core/git-checkout-index
+-rwxr-xr-x	root/root	usr/lib/git-core/git-checkout--worker
+-rwxr-xr-x	root/root	usr/lib/git-core/git-check-ref-format
 -rwxr-xr-x	root/root	usr/lib/git-core/git-cherry
 -rwxr-xr-x	root/root	usr/lib/git-core/git-cherry-pick
 -rwxr-xr-x	root/root	usr/lib/git-core/git-citool
@@ -60,9 +60,9 @@ drwxr-xr-x	root/root	usr/lib/git-core/
 -rwxr-xr-x	root/root	usr/lib/git-core/git-diff
 -rwxr-xr-x	root/root	usr/lib/git-core/git-diff-files
 -rwxr-xr-x	root/root	usr/lib/git-core/git-diff-index
--rwxr-xr-x	root/root	usr/lib/git-core/git-diff-tree
 -rwxr-xr-x	root/root	usr/lib/git-core/git-difftool
 -rwxr-xr-x	root/root	usr/lib/git-core/git-difftool--helper
+-rwxr-xr-x	root/root	usr/lib/git-core/git-diff-tree
 -rwxr-xr-x	root/root	usr/lib/git-core/git-env--helper
 -rwxr-xr-x	root/root	usr/lib/git-core/git-fast-export
 -rwxr-xr-x	root/root	usr/lib/git-core/git-fast-import
@@ -108,9 +108,9 @@ drwxr-xr-x	root/root	usr/lib/git-core/
 -rwxr-xr-x	root/root	usr/lib/git-core/git-merge-recursive
 -rwxr-xr-x	root/root	usr/lib/git-core/git-merge-resolve
 -rwxr-xr-x	root/root	usr/lib/git-core/git-merge-subtree
--rwxr-xr-x	root/root	usr/lib/git-core/git-merge-tree
 -rwxr-xr-x	root/root	usr/lib/git-core/git-mergetool
 -rw-r--r--	root/root	usr/lib/git-core/git-mergetool--lib
+-rwxr-xr-x	root/root	usr/lib/git-core/git-merge-tree
 -rwxr-xr-x	root/root	usr/lib/git-core/git-mktag
 -rwxr-xr-x	root/root	usr/lib/git-core/git-mktree
 -rwxr-xr-x	root/root	usr/lib/git-core/git-multi-pack-index
@@ -130,7 +130,6 @@ drwxr-xr-x	root/root	usr/lib/git-core/
 -rwxr-xr-x	root/root	usr/lib/git-core/git-range-diff
 -rwxr-xr-x	root/root	usr/lib/git-core/git-read-tree
 -rwxr-xr-x	root/root	usr/lib/git-core/git-rebase
--rw-r--r--	root/root	usr/lib/git-core/git-rebase--preserve-merges
 -rwxr-xr-x	root/root	usr/lib/git-core/git-receive-pack
 -rwxr-xr-x	root/root	usr/lib/git-core/git-reflog
 -rwxr-xr-x	root/root	usr/lib/git-core/git-remote
@@ -146,21 +145,21 @@ drwxr-xr-x	root/root	usr/lib/git-core/
 -rwxr-xr-x	root/root	usr/lib/git-core/git-rerere
 -rwxr-xr-x	root/root	usr/lib/git-core/git-reset
 -rwxr-xr-x	root/root	usr/lib/git-core/git-restore
+-rwxr-xr-x	root/root	usr/lib/git-core/git-revert
 -rwxr-xr-x	root/root	usr/lib/git-core/git-rev-list
 -rwxr-xr-x	root/root	usr/lib/git-core/git-rev-parse
--rwxr-xr-x	root/root	usr/lib/git-core/git-revert
 -rwxr-xr-x	root/root	usr/lib/git-core/git-rm
 -rwxr-xr-x	root/root	usr/lib/git-core/git-send-email
 -rwxr-xr-x	root/root	usr/lib/git-core/git-send-pack
+-rwxr-xr-x	root/root	usr/lib/git-core/git-shell
 -rw-r--r--	root/root	usr/lib/git-core/git-sh-i18n
 -rwxr-xr-x	root/root	usr/lib/git-core/git-sh-i18n--envsubst
--rw-r--r--	root/root	usr/lib/git-core/git-sh-setup
--rwxr-xr-x	root/root	usr/lib/git-core/git-shell
 -rwxr-xr-x	root/root	usr/lib/git-core/git-shortlog
 -rwxr-xr-x	root/root	usr/lib/git-core/git-show
 -rwxr-xr-x	root/root	usr/lib/git-core/git-show-branch
 -rwxr-xr-x	root/root	usr/lib/git-core/git-show-index
 -rwxr-xr-x	root/root	usr/lib/git-core/git-show-ref
+-rw-r--r--	root/root	usr/lib/git-core/git-sh-setup
 -rwxr-xr-x	root/root	usr/lib/git-core/git-sparse-checkout
 -rwxr-xr-x	root/root	usr/lib/git-core/git-stage
 -rwxr-xr-x	root/root	usr/lib/git-core/git-stash
@@ -218,17 +217,16 @@ drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.32/FromCPAN/
 -rw-r--r--	root/root	usr/lib/perl5/site_perl/5.32/FromCPAN/Error.pm
 drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.32/FromCPAN/Mail/
 -rw-r--r--	root/root	usr/lib/perl5/site_perl/5.32/FromCPAN/Mail/Address.pm
--rw-r--r--	root/root	usr/lib/perl5/site_perl/5.32/Git.pm
 drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.32/Git/
 -rw-r--r--	root/root	usr/lib/perl5/site_perl/5.32/Git/I18N.pm
 -rw-r--r--	root/root	usr/lib/perl5/site_perl/5.32/Git/IndexInfo.pm
--rw-r--r--	root/root	usr/lib/perl5/site_perl/5.32/Git/LoadCPAN.pm
 drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.32/Git/LoadCPAN/
 -rw-r--r--	root/root	usr/lib/perl5/site_perl/5.32/Git/LoadCPAN/Error.pm
 drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.32/Git/LoadCPAN/Mail/
 -rw-r--r--	root/root	usr/lib/perl5/site_perl/5.32/Git/LoadCPAN/Mail/Address.pm
+-rw-r--r--	root/root	usr/lib/perl5/site_perl/5.32/Git/LoadCPAN.pm
 -rw-r--r--	root/root	usr/lib/perl5/site_perl/5.32/Git/Packet.pm
--rw-r--r--	root/root	usr/lib/perl5/site_perl/5.32/Git/SVN.pm
+-rw-r--r--	root/root	usr/lib/perl5/site_perl/5.32/Git.pm
 drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.32/Git/SVN/
 -rw-r--r--	root/root	usr/lib/perl5/site_perl/5.32/Git/SVN/Editor.pm
 -rw-r--r--	root/root	usr/lib/perl5/site_perl/5.32/Git/SVN/Fetcher.pm
@@ -237,6 +235,7 @@ drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.32/Git/SVN/
 drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.32/Git/SVN/Memoize/
 -rw-r--r--	root/root	usr/lib/perl5/site_perl/5.32/Git/SVN/Memoize/YAML.pm
 -rw-r--r--	root/root	usr/lib/perl5/site_perl/5.32/Git/SVN/Migration.pm
+-rw-r--r--	root/root	usr/lib/perl5/site_perl/5.32/Git/SVN.pm
 -rw-r--r--	root/root	usr/lib/perl5/site_perl/5.32/Git/SVN/Prompt.pm
 -rw-r--r--	root/root	usr/lib/perl5/site_perl/5.32/Git/SVN/Ra.pm
 -rw-r--r--	root/root	usr/lib/perl5/site_perl/5.32/Git/SVN/Utils.pm
@@ -253,10 +252,10 @@ drwxr-xr-x	root/root	usr/share/git-core/templates/hooks/
 -rwxr-xr-x	root/root	usr/share/git-core/templates/hooks/pre-applypatch.sample
 -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-merge-commit.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/pre-push.sample
 -rwxr-xr-x	root/root	usr/share/git-core/templates/hooks/pre-rebase.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/push-to-checkout.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/
@@ -265,11 +264,11 @@ drwxr-xr-x	root/root	usr/share/git-gui/
 drwxr-xr-x	root/root	usr/share/git-gui/lib/
 -rw-r--r--	root/root	usr/share/git-gui/lib/about.tcl
 -rw-r--r--	root/root	usr/share/git-gui/lib/blame.tcl
--rw-r--r--	root/root	usr/share/git-gui/lib/branch.tcl
 -rw-r--r--	root/root	usr/share/git-gui/lib/branch_checkout.tcl
 -rw-r--r--	root/root	usr/share/git-gui/lib/branch_create.tcl
 -rw-r--r--	root/root	usr/share/git-gui/lib/branch_delete.tcl
 -rw-r--r--	root/root	usr/share/git-gui/lib/branch_rename.tcl
+-rw-r--r--	root/root	usr/share/git-gui/lib/branch.tcl
 -rw-r--r--	root/root	usr/share/git-gui/lib/browser.tcl
 -rw-r--r--	root/root	usr/share/git-gui/lib/checkout_op.tcl
 -rw-r--r--	root/root	usr/share/git-gui/lib/choose_font.tcl
@@ -306,9 +305,9 @@ drwxr-xr-x	root/root	usr/share/git-gui/lib/msgs/
 -rw-r--r--	root/root	usr/share/git-gui/lib/msgs/vi.msg
 -rw-r--r--	root/root	usr/share/git-gui/lib/msgs/zh_cn.msg
 -rw-r--r--	root/root	usr/share/git-gui/lib/option.tcl
--rw-r--r--	root/root	usr/share/git-gui/lib/remote.tcl
 -rw-r--r--	root/root	usr/share/git-gui/lib/remote_add.tcl
 -rw-r--r--	root/root	usr/share/git-gui/lib/remote_branch_delete.tcl
+-rw-r--r--	root/root	usr/share/git-gui/lib/remote.tcl
 -rw-r--r--	root/root	usr/share/git-gui/lib/search.tcl
 -rw-r--r--	root/root	usr/share/git-gui/lib/shortcut.tcl
 -rw-r--r--	root/root	usr/share/git-gui/lib/spellcheck.tcl
@@ -316,11 +315,11 @@ drwxr-xr-x	root/root	usr/share/git-gui/lib/msgs/
 -rw-r--r--	root/root	usr/share/git-gui/lib/status_bar.tcl
 -rw-r--r--	root/root	usr/share/git-gui/lib/tclIndex
 -rw-r--r--	root/root	usr/share/git-gui/lib/themed.tcl
--rw-r--r--	root/root	usr/share/git-gui/lib/tools.tcl
 -rw-r--r--	root/root	usr/share/git-gui/lib/tools_dlg.tcl
+-rw-r--r--	root/root	usr/share/git-gui/lib/tools.tcl
 -rw-r--r--	root/root	usr/share/git-gui/lib/transport.tcl
--rw-r--r--	root/root	usr/share/git-gui/lib/win32.tcl
 -rw-r--r--	root/root	usr/share/git-gui/lib/win32_shortcut.js
+-rw-r--r--	root/root	usr/share/git-gui/lib/win32.tcl
 drwxr-xr-x	root/root	usr/share/gitweb/
 -rwxr-xr-x	root/root	usr/share/gitweb/gitweb.cgi
 drwxr-xr-x	root/root	usr/share/gitweb/static/
@@ -330,6 +329,7 @@ drwxr-xr-x	root/root	usr/share/gitweb/static/
 -rw-r--r--	root/root	usr/share/gitweb/static/gitweb.js
 drwxr-xr-x	root/root	usr/share/man/
 drwxr-xr-x	root/root	usr/share/man/man1/
+-rw-r--r--	root/root	usr/share/man/man1/git.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-add.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-am.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-annotate.1.gz
@@ -345,45 +345,45 @@ drwxr-xr-x	root/root	usr/share/man/man1/
 -rw-r--r--	root/root	usr/share/man/man1/git-check-attr.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-check-ignore.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-check-mailmap.1.gz
--rw-r--r--	root/root	usr/share/man/man1/git-check-ref-format.1.gz
--rw-r--r--	root/root	usr/share/man/man1/git-checkout-index.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-checkout.1.gz
--rw-r--r--	root/root	usr/share/man/man1/git-cherry-pick.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/git-checkout-index.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/git-check-ref-format.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-cherry.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/git-cherry-pick.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-citool.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-clean.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-clone.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-column.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/git-commit.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-commit-graph.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-commit-tree.1.gz
--rw-r--r--	root/root	usr/share/man/man1/git-commit.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-config.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-count-objects.1.gz
--rw-r--r--	root/root	usr/share/man/man1/git-credential-cache--daemon.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/git-credential.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-credential-cache.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/git-credential-cache--daemon.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-credential-store.1.gz
--rw-r--r--	root/root	usr/share/man/man1/git-credential.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-cvsexportcommit.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-cvsimport.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-cvsserver.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-daemon.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-describe.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/git-diff.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-diff-files.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-diff-index.1.gz
--rw-r--r--	root/root	usr/share/man/man1/git-diff-tree.1.gz
--rw-r--r--	root/root	usr/share/man/man1/git-diff.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-difftool.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/git-diff-tree.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-fast-export.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-fast-import.1.gz
--rw-r--r--	root/root	usr/share/man/man1/git-fetch-pack.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-fetch.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/git-fetch-pack.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-filter-branch.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-fmt-merge-msg.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-for-each-ref.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-for-each-repo.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-format-patch.1.gz
--rw-r--r--	root/root	usr/share/man/man1/git-fsck-objects.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-fsck.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/git-fsck-objects.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-gc.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-get-tar-commit-id.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-grep.1.gz
@@ -395,10 +395,11 @@ drwxr-xr-x	root/root	usr/share/man/man1/
 -rw-r--r--	root/root	usr/share/man/man1/git-http-push.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-imap-send.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-index-pack.1.gz
--rw-r--r--	root/root	usr/share/man/man1/git-init-db.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-init.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/git-init-db.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-instaweb.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-interpret-trailers.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/gitk.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-log.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-ls-files.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-ls-remote.1.gz
@@ -406,14 +407,14 @@ drwxr-xr-x	root/root	usr/share/man/man1/
 -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.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
 -rw-r--r--	root/root	usr/share/man/man1/git-merge-one-file.1.gz
--rw-r--r--	root/root	usr/share/man/man1/git-merge-tree.1.gz
--rw-r--r--	root/root	usr/share/man/man1/git-merge.1.gz
--rw-r--r--	root/root	usr/share/man/man1/git-mergetool--lib.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-mergetool.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/git-mergetool--lib.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/git-merge-tree.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-mktag.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-mktree.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-multi-pack-index.1.gz
@@ -425,8 +426,8 @@ drwxr-xr-x	root/root	usr/share/man/man1/
 -rw-r--r--	root/root	usr/share/man/man1/git-pack-redundant.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-pack-refs.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-patch-id.1.gz
--rw-r--r--	root/root	usr/share/man/man1/git-prune-packed.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-prune.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/git-prune-packed.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-pull.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-push.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-quiltimport.1.gz
@@ -435,30 +436,30 @@ drwxr-xr-x	root/root	usr/share/man/man1/
 -rw-r--r--	root/root	usr/share/man/man1/git-rebase.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-receive-pack.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-reflog.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/git-remote.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-remote-ext.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-remote-fd.1.gz
--rw-r--r--	root/root	usr/share/man/man1/git-remote.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-repack.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-replace.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-request-pull.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-rerere.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-reset.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-restore.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/git-revert.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-rev-list.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-rev-parse.1.gz
--rw-r--r--	root/root	usr/share/man/man1/git-revert.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-rm.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-send-email.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-send-pack.1.gz
--rw-r--r--	root/root	usr/share/man/man1/git-sh-i18n--envsubst.1.gz
--rw-r--r--	root/root	usr/share/man/man1/git-sh-i18n.1.gz
--rw-r--r--	root/root	usr/share/man/man1/git-sh-setup.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-shell.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/git-sh-i18n.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/git-sh-i18n--envsubst.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-shortlog.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/git-show.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-show-branch.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-show-index.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-show-ref.1.gz
--rw-r--r--	root/root	usr/share/man/man1/git-show.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/git-sh-setup.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-sparse-checkout.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-stage.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-stash.1.gz
@@ -481,13 +482,11 @@ drwxr-xr-x	root/root	usr/share/man/man1/
 -rw-r--r--	root/root	usr/share/man/man1/git-verify-pack.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-verify-tag.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-version.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/gitweb.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-web--browse.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-whatchanged.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-worktree.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-write-tree.1.gz
--rw-r--r--	root/root	usr/share/man/man1/git.1.gz
--rw-r--r--	root/root	usr/share/man/man1/gitk.1.gz
--rw-r--r--	root/root	usr/share/man/man1/gitweb.1.gz
 drwxr-xr-x	root/root	usr/share/man/man5/
 -rw-r--r--	root/root	usr/share/man/man5/gitattributes.5.gz
 -rw-r--r--	root/root	usr/share/man/man5/githooks.5.gz
diff --git a/git/.signature b/git/.signature
index 53b966aba..fc6ca5e07 100644
--- a/git/.signature
+++ b/git/.signature
@@ -1,8 +1,8 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/TwpFU3OuHf7Ycn5/b4dLzmusEQ5KmRD+4bo5Wd79OaxiOQaQG4iBlUWeRrv5/HBBemds2+AC5IZBCmSzvmHXw0=
-SHA256 (Pkgfile) = 4141a6cb4061a7cfd842b38468e97b9dbbf8349adcfe29bc2efebac934ad3e5e
-SHA256 (.footprint) = 8ecbe22a1a5615e2c19c567324895a79eb017f07759fd1da15ca0f4be39027fc
-SHA256 (git-2.33.1.tar.xz) = e054a6e6c2b088bd1bff5f61ed9ba5aa91c9a3cd509539a4b41c5ddf02201f2f
-SHA256 (git-manpages-2.33.1.tar.xz) = c75219f1c9f56caad4f8eb17915e4fe34ca5e1b453773df279a2cec98205ab87
+RWSE3ohX2g5d/bhFhWewz2QHUEK2Owz6orzicwMyBc6AiypF8N5NaOhFbVu9v4BEZ5fv7Mb1PyLDYiG1+jmX+9H8uHkJETQgMgM=
+SHA256 (Pkgfile) = 5e17352ed5c1d31591392eaf49d6bf8bd5ab44505c6e1cf46ca2f807b636e1b5
+SHA256 (.footprint) = ccad48e846f99cd6b958d4aad72a9a6f9df0d57fa8a133e504ffc331bdc1c5f7
+SHA256 (git-2.34.0.tar.xz) = fd6cb9b26665794c61f9ca917dcf00e7c19b0c02be575ad6ba9354fa6962411f
+SHA256 (git-manpages-2.34.0.tar.xz) = 47eafa3517ef5fc7a6e914ad2ee6a6e4d830a4bb6830dba13175850860492c72
 SHA256 (git) = 432108f8c5f5abeb429cab25181b43ee42060d46fa7fbe7e4b02790b56f61e8a
 SHA256 (gitd.rc) = 3a7a13fcfbf493890e58a3c1c8a71de08518b35fa6fe6109120a03cd8beeac25
diff --git a/git/Pkgfile b/git/Pkgfile
index 22dc11f7b..b9be1c5b9 100644
--- a/git/Pkgfile
+++ b/git/Pkgfile
@@ -1,11 +1,11 @@
 # Description: Directory content manager
 # URL: https://git-scm.com/
 # Maintainer: CRUX System Team, core-ports at crux dot nu
-# Depends on: expat curl
+# Depends on: curl expat
 # Optional: tk
 
 name=git
-version=2.33.1
+version=2.34.0
 release=1
 source=(https://www.kernel.org/pub/software/scm/git/git-{,manpages-}$version.tar.xz
   git gitd.rc)
@@ -36,5 +36,4 @@ build() {
   install -Dm755 $SRC/git $PKG/etc/ports/drivers/git
 
   install -D $SRC/gitd.rc $PKG/etc/rc.d/gitd
-
 }