1
0
mirror of https://github.com/git/git.git synced 2024-11-19 02:13:55 +01:00

The first batch in 2.31 cycle

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2021-01-06 23:22:15 -08:00
parent d3aff11c3e
commit 72c4083ddf
3 changed files with 34 additions and 2 deletions

@ -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).

@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
DEF_VER=v2.30.0
DEF_VER=v2.30.GIT
LF='
'

@ -1 +1 @@
Documentation/RelNotes/2.30.0.txt
Documentation/RelNotes/2.31.0.txt