From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 15 Dec 2018 04:00:25 +0000 (+0900)
Subject: Sync with Git 2.20.1
X-Git-Tag: v2.21.0-rc0~136
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b21ebb671bb7dea8d342225f0d66c41f4e54d5ca?hp=0d0ac3826a3bbb9247e39e12623bbcfdd722f24c

Sync with Git 2.20.1

* maint:
Git 2.20.1
.gitattributes: ensure t/oid-info/* has eol=lf
t9902: 'send-email' test case requires PERL
t4256: mark support files as LF-only
parse-options: fix SunCC compiler warning
help -a: handle aliases with long names gracefully
help.h: fix coding style
run-command: report exec failure
---

diff --git a/Documentation/RelNotes/2.21.0.txt b/Documentation/RelNotes/2.21.0.txt
new file mode 100644
index 0000000000..ad681bd5d5
--- /dev/null
+++ b/Documentation/RelNotes/2.21.0.txt
@@ -0,0 +1,22 @@
+Git 2.21 Release Notes
+======================
+
+Backward Compatibility Notes
+----------------------------
+
+
+Updates since v2.20
+-------------------
+
+UI, Workflows & Features
+
+
+
+Performance, Internal Implementation, Development Support etc.
+
+
+
+Fixes since v2.20
+-----------------
+
+ * Code cleanup, docfix, build fix, etc.
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index d1a2814ec7..0a3ccac70a 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.20.1
+DEF_VER=v2.20.GIT
 
 LF='
 '
diff --git a/RelNotes b/RelNotes
index 463a237c65..31e21359a8 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/2.20.1.txt
\ No newline at end of file
+Documentation/RelNotes/2.21.0.txt
\ No newline at end of file