diff --git a/Documentation/RelNotes/2.31.0.txt b/Documentation/RelNotes/2.31.0.txt new file mode 100644 index 0000000000..6bde597b2d --- /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 5085ef1390..0327733794 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 dc8c04b4f4..3324fc058d 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