The first batch in 2.31 cycle
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Jan 6, 2021 at 23:22 UTC
72c4083ddf91b489b7b7b812df67ee8842177d98
3 files changed
+34
-2
Documentation/RelNotes/2.31.0.txt
new
+32
@@ -0,0 +1,32 @@
1
+Git 2.31 Release Notes
2
+======================
3
+
4
+Updates since v2.30
5
+-------------------
6
+
7
+UI, Workflows & Features
8
+
9
+ * The "--format=%(trailers)" mechanism gets enhanced to make it
10
+ easier to design output for machine consumption.
11
+
12
+ * When a user does not tell "git pull" to use rebase or merge, the
13
+ command gives a loud message telling a user to choose between
14
+ rebase or merge but creates a merge anyway, forcing users who would
15
+ want to rebase to redo the operation. Fix an early part of this
16
+ problem by tightening the condition to give the message---there is
17
+ no reason to stop or force the user to choose between rebase or
18
+ merge if the history fast-forwards.
19
+
20
+
21
+Performance, Internal Implementation, Development Support etc.
22
+
23
+ * A 3-year old test that was not testing anything useful has been
24
+ corrected.
25
+
26
+
27
+Fixes since v2.30
28
+-----------------
29
+
30
+ * Other code cleanup, docfix, build fix, etc.
31
+ (merge 505a276596 pk/subsub-fetch-fix-take-2 later to maint).
32
+ (merge 33fc56253b fc/t6030-bisect-reset-removes-auxiliary-files later to maint).
GIT-VERSION-GEN
+1
-1
@@ -1,7 +1,7 @@
1
#!/bin/sh
2
3
GVF=GIT-VERSION-FILE
4
-DEF_VER=v2.30.0
4
+DEF_VER=v2.30.GIT
5
6
LF='
7
'
RelNotes
+1
-1
@@ -1 +1 @@
1
-Documentation/RelNotes/2.30.0.txt
\ No newline at end of file
1
+Documentation/RelNotes/2.31.0.txt
\ No newline at end of file