Index: Makefile
===================================================================
--- Makefile	(revision 493841)
+++ Makefile	(working copy)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	git
-DISTVERSION=	2.20.1
+DISTVERSION=	2.21.0
 CATEGORIES=	devel
 MASTER_SITES=	KERNEL_ORG/software/scm/git
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
Index: distinfo
===================================================================
--- distinfo	(revision 493841)
+++ distinfo	(working copy)
@@ -1,7 +1,5 @@
-TIMESTAMP = 1545044408
-SHA256 (git-2.20.1.tar.xz) = 9d2e91e2faa2ea61ba0a70201d023b36f54d846314591a002c610ea2ab81c3e9
-SIZE (git-2.20.1.tar.xz) = 5359872
-SHA256 (git-manpages-2.20.1.tar.xz) = 060acce347cfb712d0c7dfe7578c5291fde2d3d807917b2828c8aae3c90876ba
-SIZE (git-manpages-2.20.1.tar.xz) = 439172
-SHA256 (git-htmldocs-2.20.1.tar.xz) = 18a00408437c6816e7c5396c8b96b38bf022f924852492a73dd3888ad2572ad7
-SIZE (git-htmldocs-2.20.1.tar.xz) = 1227884
+TIMESTAMP = 1551087785
+SHA256 (git-2.21.0.tar.xz) = 8ccb1ce743ee991d91697e163c47c11be4bf81efbdd9fb0b4a7ad77cc0020d28
+SIZE (git-2.21.0.tar.xz) = 5491296
+SHA256 (git-manpages-2.21.0.tar.xz) = 2f68dc24931c0d05f70167d9ffe6c33ef6b0b6c75b92301ddcda55b9b0f5ec51
+SIZE (git-manpages-2.21.0.tar.xz) = 440096
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 493841)
+++ pkg-plist	(working copy)
@@ -141,7 +141,6 @@
 libexec/git-core/git-rebase--am
 libexec/git-core/git-rebase--common
 libexec/git-core/git-rebase--interactive
-libexec/git-core/git-rebase--merge
 libexec/git-core/git-rebase--preserve-merges
 libexec/git-core/git-receive-pack
 libexec/git-core/git-reflog
@@ -1277,6 +1276,7 @@
 %%CONTRIB%%share/git-core/contrib/coccinelle/qsort.cocci
 %%CONTRIB%%share/git-core/contrib/coccinelle/strbuf.cocci
 %%CONTRIB%%share/git-core/contrib/coccinelle/swap.cocci
+%%CONTRIB%%share/git-core/contrib/coccinelle/the_repository.pending.cocci
 %%CONTRIB%%share/git-core/contrib/coccinelle/xstrdup_or_null.cocci
 %%CONTRIB%%share/git-core/contrib/completion/git-completion.bash
 %%CONTRIB%%share/git-core/contrib/completion/git-completion.tcsh
@@ -1304,11 +1304,11 @@
 %%CONTRIB%%share/git-core/contrib/credential/osxkeychain/git-credential-osxkeychain.c
 %%CONTRIB%%share/git-core/contrib/credential/wincred/Makefile
 %%CONTRIB%%share/git-core/contrib/credential/wincred/git-credential-wincred.c
+%%CONTRIB%%share/git-core/contrib/diff-highlight/DiffHighlight.pm
 %%CONTRIB%%share/git-core/contrib/diff-highlight/Makefile
 %%CONTRIB%%share/git-core/contrib/diff-highlight/README
-%%CONTRIB%%share/git-core/contrib/diff-highlight/DiffHighlight.pm
+%%CONTRIB%%share/git-core/contrib/diff-highlight/diff-highlight
 %%CONTRIB%%share/git-core/contrib/diff-highlight/diff-highlight.perl
-%%CONTRIB%%share/git-core/contrib/diff-highlight/diff-highlight
 %%CONTRIB%%share/git-core/contrib/diff-highlight/t/Makefile
 %%CONTRIB%%share/git-core/contrib/diff-highlight/t/t9400-diff-highlight.sh
 %%CONTRIB%%share/git-core/contrib/emacs/README
@@ -1331,9 +1331,9 @@
 %%CONTRIB%%share/git-core/contrib/hg-to-git/hg-to-git.txt
 %%CONTRIB%%share/git-core/contrib/hooks/multimail/CHANGES
 %%CONTRIB%%share/git-core/contrib/hooks/multimail/CONTRIBUTING.rst
-%%CONTRIB%%share/git-core/contrib/hooks/multimail/README
 %%CONTRIB%%share/git-core/contrib/hooks/multimail/README.Git
 %%CONTRIB%%share/git-core/contrib/hooks/multimail/README.migrate-from-post-receive-email
+%%CONTRIB%%share/git-core/contrib/hooks/multimail/README.rst
 %%CONTRIB%%share/git-core/contrib/hooks/multimail/doc/customizing-emails.rst
 %%CONTRIB%%share/git-core/contrib/hooks/multimail/doc/gerrit.rst
 %%CONTRIB%%share/git-core/contrib/hooks/multimail/doc/gitolite.rst
@@ -1493,6 +1493,7 @@
 %%NLS%%share/locale/bg/LC_MESSAGES/git.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/git.mo
 %%NLS%%share/locale/de/LC_MESSAGES/git.mo
+%%NLS%%share/locale/el/LC_MESSAGES/git.mo
 %%NLS%%share/locale/es/LC_MESSAGES/git.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/git.mo
 %%NLS%%share/locale/is/LC_MESSAGES/git.mo