3 files changed, 15 insertions, 14 deletions

diff --git a/devel/git/Makefile b/devel/git/Makefile
index cc294a33ecf0..2abd3f7f4e7d 100644
--- a/devel/git/Makefile
+++ b/devel/git/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	git
-DISTVERSION=	2.19.2
+DISTVERSION=	2.20.0
 CATEGORIES=	devel
 MASTER_SITES=	KERNEL_ORG/software/scm/git
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
@@ -28,7 +28,7 @@ GNU_CONFIGURE=	yes
 USES=		autoreconf gmake iconv shebangfix ssl tar:xz
 CPPFLAGS+=	-isystem${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-MAKE_ARGS+=	DEVELOPER_CFLAGS=
+MAKE_ARGS+=	DEVELOPER=
 MAKE_ENV+=	V=1
 USE_RC_SUBR=	git_daemon
 SHEBANG_FILES=	*.perl */*.perl */*/*.perl */*.pl */*/*.pl */*/*/*.pl \
diff --git a/devel/git/distinfo b/devel/git/distinfo
index 7df53c1c95cd..cc8068d71fc0 100644
--- a/devel/git/distinfo
+++ b/devel/git/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1542765463
-SHA256 (git-2.19.2.tar.xz) = fce9a3a3297db5f3756c4553a2fc1fec209ee08178f8491e76ff4ff8fe7b8be9
-SIZE (git-2.19.2.tar.xz) = 5235608
-SHA256 (git-manpages-2.19.2.tar.xz) = 25fd8ba1914f5859b59f72d6c6aa2324abe84891e071adae2195faa526a510eb
-SIZE (git-manpages-2.19.2.tar.xz) = 432200
-SHA256 (git-htmldocs-2.19.2.tar.xz) = e982186ee09a3cb36d89aa974ca4dc5d4420f6be53c9ee0419a466db02bacbc0
-SIZE (git-htmldocs-2.19.2.tar.xz) = 1223848
+TIMESTAMP = 1544439331
+SHA256 (git-2.20.0.tar.xz) = bc94735073e14b138a1290cc99af3c379d544f514c43f8ebde988fc50d0ad81f
+SIZE (git-2.20.0.tar.xz) = 5359684
+SHA256 (git-manpages-2.20.0.tar.xz) = 79bdaa083528bc59b971131fec9b1ff1abbfcc943b4eb781ff4af5172b103690
+SIZE (git-manpages-2.20.0.tar.xz) = 439220
+SHA256 (git-htmldocs-2.20.0.tar.xz) = a9ad269dff3f8b03d9694308e82c2ea197ef59298d828e10e031bc18aae8913a
+SIZE (git-htmldocs-2.20.0.tar.xz) = 1227512
diff --git a/devel/git/pkg-plist b/devel/git/pkg-plist
index 470e42b73f14..e7a10a0de021 100644
--- a/devel/git/pkg-plist
+++ b/devel/git/pkg-plist
@@ -98,6 +98,7 @@ libexec/git-core/git-init
 libexec/git-core/git-init-db
 libexec/git-core/git-instaweb
 libexec/git-core/git-interpret-trailers
+libexec/git-core/git-legacy-rebase
 libexec/git-core/git-log
 libexec/git-core/git-ls-files
 libexec/git-core/git-ls-remote
@@ -120,6 +121,7 @@ libexec/git-core/git-mergetool--lib
 libexec/git-core/git-mktag
 libexec/git-core/git-mktree
 libexec/git-core/git-mv
+libexec/git-core/git-multi-pack-index
 libexec/git-core/git-name-rev
 libexec/git-core/git-notes
 %%P4%%libexec/git-core/git-p4
@@ -137,7 +139,7 @@ libexec/git-core/git-range-diff
 libexec/git-core/git-read-tree
 libexec/git-core/git-rebase
 libexec/git-core/git-rebase--am
-libexec/git-core/git-rebase--helper
+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
@@ -307,6 +309,7 @@ man/man1/git-mergetool.1.gz
 man/man1/git-mktag.1.gz
 man/man1/git-mktree.1.gz
 man/man1/git-mv.1.gz
+man/man1/git-multi-pack-index.1.gz
 man/man1/git-name-rev.1.gz
 man/man1/git-notes.1.gz
 man/man1/git-p4.1.gz
@@ -677,6 +680,7 @@ man/man7/gitworkflows.7.gz
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.19.0.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.19.1.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.19.2.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.20.0.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.0.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.1.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.2.txt
@@ -754,14 +758,12 @@ man/man7/gitworkflows.7.gz
 %%HTMLDOCS%%%%DOCSDIR%%/cmds-synchingrepositories.txt
 %%HTMLDOCS%%%%DOCSDIR%%/config.txt
 %%HTMLDOCS%%%%DOCSDIR%%/date-formats.txt
-%%HTMLDOCS%%%%DOCSDIR%%/diff-config.txt
 %%HTMLDOCS%%%%DOCSDIR%%/diff-format.txt
 %%HTMLDOCS%%%%DOCSDIR%%/diff-generate-patch.txt
 %%HTMLDOCS%%%%DOCSDIR%%/diff-options.txt
 %%HTMLDOCS%%%%DOCSDIR%%/docbook-xsl.css
 %%HTMLDOCS%%%%DOCSDIR%%/everyday.html
 %%HTMLDOCS%%%%DOCSDIR%%/fetch-options.txt
-%%HTMLDOCS%%%%DOCSDIR%%/fmt-merge-msg-config.txt
 %%HTMLDOCS%%%%DOCSDIR%%/git-add.html
 %%HTMLDOCS%%%%DOCSDIR%%/git-add.txt
 %%HTMLDOCS%%%%DOCSDIR%%/git-am.html
@@ -1147,7 +1149,6 @@ man/man7/gitworkflows.7.gz
 %%HTMLDOCS%%%%DOCSDIR%%/index.html
 %%HTMLDOCS%%%%DOCSDIR%%/line-range-format.txt
 %%HTMLDOCS%%%%DOCSDIR%%/mailmap.txt
-%%HTMLDOCS%%%%DOCSDIR%%/merge-config.txt
 %%HTMLDOCS%%%%DOCSDIR%%/merge-options.txt
 %%HTMLDOCS%%%%DOCSDIR%%/merge-strategies.txt
 %%HTMLDOCS%%%%DOCSDIR%%/mergetools-diff.txt
@@ -1156,7 +1157,6 @@ man/man7/gitworkflows.7.gz
 %%HTMLDOCS%%%%DOCSDIR%%/pretty-options.txt
 %%HTMLDOCS%%%%DOCSDIR%%/pull-fetch-param.txt
 %%HTMLDOCS%%%%DOCSDIR%%/rev-list-options.txt
-%%HTMLDOCS%%%%DOCSDIR%%/rebase-config.txt
 %%HTMLDOCS%%%%DOCSDIR%%/revisions.txt
 %%HTMLDOCS%%%%DOCSDIR%%/sequencer.txt
 %%HTMLDOCS%%%%DOCSDIR%%/technical/api-allocation-growing.html
@@ -1284,6 +1284,7 @@ share/emacs/site-lisp/git/git.el
 %%CONTRIB%%share/git-core/contrib/contacts/Makefile
 %%CONTRIB%%share/git-core/contrib/contacts/git-contacts
 %%CONTRIB%%share/git-core/contrib/contacts/git-contacts.txt
+%%CONTRIB%%share/git-core/contrib/coverage-diff.sh
 %%CONTRIB%%share/git-core/contrib/credential/gnome-keyring/.gitignore
 %%CONTRIB%%share/git-core/contrib/credential/gnome-keyring/Makefile
 %%CONTRIB%%share/git-core/contrib/credential/gnome-keyring/git-credential-gnome-keyring.c