Skip to content

Commit b4374e9

Browse files
committed
Git 2.26-rc1
Signed-off-by: Junio C Hamano <[email protected]>
1 parent 4a5c3e1 commit b4374e9

File tree

2 files changed

+28
-1
lines changed

2 files changed

+28
-1
lines changed

Documentation/RelNotes/2.26.0.txt

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,18 @@ UI, Workflows & Features
4747
* "git clone --recurse-submodules --single-branch" now uses the same
4848
single-branch option when cloning the submodules.
4949

50+
* "git rm" and "git stash" learns the new "--pathspec-from-file"
51+
option.
52+
53+
* "git am --short-current-patch" is a way to show the piece of e-mail
54+
for the stopped step, which is not suitable to directly feed "git
55+
apply" (it is designed to be a good "git am" input). It learned a
56+
new option to show only the patch part.
57+
58+
* Handling of conflicting renames in merge-recursive have further
59+
been made consistent with how existing codepaths try to mimic what
60+
is done to add/add conflicts.
61+
5062

5163
Performance, Internal Implementation, Development Support etc.
5264

@@ -288,6 +300,18 @@ Fixes since v2.25
288300
reverted.
289301
(merge 0106b1d4be hi/gpg-use-check-signature later to maint).
290302

303+
* MinGW's poll() emulation has been improved.
304+
(merge 94f4d01932 am/mingw-poll-fix later to maint).
305+
306+
* "git show" and others gave an object name in raw format in its
307+
error output, which has been corrected to give it in hex.
308+
(merge 237a28173f hd/show-one-mergetag-fix later to maint).
309+
310+
* "git fetch" over HTTP walker protocol did not show any progress
311+
output. We inherently do not know how much work remains, but still
312+
we can show something not to bore users.
313+
(merge 7655b4119d rs/show-progress-in-dumb-http-fetch later to maint).
314+
291315
* Other code cleanup, docfix, build fix, etc.
292316
(merge 26f924d50e en/simplify-check-updates-in-unpack-trees later to maint).
293317
(merge d0d0a357a1 am/update-pathspec-f-f-tests later to maint).
@@ -315,3 +339,6 @@ Fixes since v2.25
315339
(merge 240fc04f81 ag/rebase-remove-redundant-code later to maint).
316340
(merge 7f487ce062 js/ci-windows-update later to maint).
317341
(merge d68ce906c7 rs/commit-graph-code-simplification later to maint).
342+
(merge a51d9e8f07 rj/t1050-use-test-path-is-file later to maint).
343+
(merge fd0bc17557 kk/complete-diff-color-moved later to maint).
344+
(merge 65bf820d0e en/test-cleanup later to maint).

GIT-VERSION-GEN

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22

33
GVF=GIT-VERSION-FILE
4-
DEF_VER=v2.26.0-rc0
4+
DEF_VER=v2.26.0-rc1
55

66
LF='
77
'

0 commit comments

Comments
 (0)