Skip to content

Commit 30e9940

Browse files
committed
Hopefully the final batch before -rc2
Signed-off-by: Junio C Hamano <[email protected]>
1 parent b4f0038 commit 30e9940

File tree

1 file changed

+21
-0
lines changed

1 file changed

+21
-0
lines changed

Documentation/RelNotes/2.26.0.txt

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,20 @@ Git 2.26 Release Notes
44
Updates since v2.25
55
-------------------
66

7+
Backward compatibility notes
8+
9+
* "git rebase" uses a different backend that is based on the 'merge'
10+
machinery by default. There are a few known differences in the
11+
behaviour from the traditional machniery based on patch+apply.
12+
13+
If your workflow is negatively affected by this change, please
14+
report it to [email protected] so that we can take a look into
15+
it. In the meantime, the 'rebase.backend' configuration variable
16+
can be set in order to use the old default behaviour (the value to
17+
do so is not described here---it is given to those who report their
18+
issues to the list ;-).
19+
20+
721
UI, Workflows & Features
822

923
* Sample credential helper for using .netrc has been updated to work
@@ -312,6 +326,13 @@ Fixes since v2.25
312326
we can show something not to bore users.
313327
(merge 7655b4119d rs/show-progress-in-dumb-http-fetch later to maint).
314328

329+
* Both "git ls-remote -h" and "git grep -h" give short usage help,
330+
like any other Git subcommand, but it is not unreasonable to expect
331+
that the former would behave the same as "git ls-remote --head"
332+
(there is no other sensible behaviour for the latter). The
333+
documentation has been updated in an attempt to clarify this.
334+
(merge 1ff466c018 jc/doc-single-h-is-for-help later to maint).
335+
315336
* Other code cleanup, docfix, build fix, etc.
316337
(merge 26f924d50e en/simplify-check-updates-in-unpack-trees later to maint).
317338
(merge d0d0a357a1 am/update-pathspec-f-f-tests later to maint).

0 commit comments

Comments
 (0)