Skip to content

Commit

Permalink
The first batch in 2.31 cycle
Browse files Browse the repository at this point in the history
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
gitster committed Jan 7, 2021
1 parent d3aff11 commit 72c4083
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 2 deletions.
32 changes: 32 additions & 0 deletions Documentation/RelNotes/2.31.0.txt
Original file line number Diff line number Diff line change
@@ -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).
2 changes: 1 addition & 1 deletion GIT-VERSION-GEN
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh

GVF=GIT-VERSION-FILE
DEF_VER=v2.30.0
DEF_VER=v2.30.GIT

LF='
'
Expand Down
2 changes: 1 addition & 1 deletion RelNotes

0 comments on commit 72c4083

Please sign in to comment.