summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-01-07 07:22:15 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-01-07 07:33:44 (GMT)
commit72c4083ddf91b489b7b7b812df67ee8842177d98 (patch)
treeaa7201a1dd842a3d66155c5aa832e1885779c91f
parentd3aff11c3eadf3c496859180d453ce07cde72b44 (diff)
downloadgit-72c4083ddf91b489b7b7b812df67ee8842177d98.zip
git-72c4083ddf91b489b7b7b812df67ee8842177d98.tar.gz
git-72c4083ddf91b489b7b7b812df67ee8842177d98.tar.bz2
The first batch in 2.31 cycle
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/RelNotes/2.31.0.txt32
-rwxr-xr-xGIT-VERSION-GEN2
l---------RelNotes2
3 files changed, 34 insertions, 2 deletions
diff --git a/Documentation/RelNotes/2.31.0.txt b/Documentation/RelNotes/2.31.0.txt
new file mode 100644
index 0000000..6bde597
--- /dev/null
+++ b/Documentation/RelNotes/2.31.0.txt
@@ -0,0 +1,32 @@
+Git 2.31 Release Notes
+======================
+
+Updates since v2.30
+-------------------
+
+UI, Workflows & Features
+
+ * The "--format=%(trailers)" mechanism gets enhanced to make it
+ easier to design output for machine consumption.
+
+ * When a user does not tell "git pull" to use rebase or merge, the
+ command gives a loud message telling a user to choose between
+ rebase or merge but creates a merge anyway, forcing users who would
+ want to rebase to redo the operation. Fix an early part of this
+ problem by tightening the condition to give the message---there is
+ no reason to stop or force the user to choose between rebase or
+ merge if the history fast-forwards.
+
+
+Performance, Internal Implementation, Development Support etc.
+
+ * A 3-year old test that was not testing anything useful has been
+ corrected.
+
+
+Fixes since v2.30
+-----------------
+
+ * Other code cleanup, docfix, build fix, etc.
+ (merge 505a276596 pk/subsub-fetch-fix-take-2 later to maint).
+ (merge 33fc56253b fc/t6030-bisect-reset-removes-auxiliary-files later to maint).
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 5085ef1..0327733 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v2.30.0
+DEF_VER=v2.30.GIT
LF='
'
diff --git a/RelNotes b/RelNotes
index dc8c04b..3324fc0 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/2.30.0.txt \ No newline at end of file
+Documentation/RelNotes/2.31.0.txt \ No newline at end of file