Skip to content

Commit e2ac914

Browse files
committed
The fifth batch
Signed-off-by: Junio C Hamano <[email protected]>
1 parent 037dbe8 commit e2ac914

File tree

1 file changed

+24
-0
lines changed

1 file changed

+24
-0
lines changed

Documentation/RelNotes/2.36.0.txt

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,15 @@ UI, Workflows & Features
2525
* "git log --remerge-diff" shows the difference from mechanical merge
2626
result and the result that is actually recorded in a merge commit.
2727

28+
* "git log" and friends learned an option --exclude-first-parent-only
29+
to propagate UNINTERESTING bit down only along the first-parent
30+
chain, just like --first-parent option shows commits that lack the
31+
UNINTERESTING bit only along the first-parent chain.
32+
33+
* The command line completion script (in contrib/) learned to
34+
complete all Git subcommands, including the ones that are normally
35+
hidden, when GIT_COMPLETION_SHOW_ALL_COMMANDS is used.
36+
2837

2938
Performance, Internal Implementation, Development Support etc.
3039

@@ -47,6 +56,9 @@ Performance, Internal Implementation, Development Support etc.
4756
all. Start the process of renaming it to "--annotate-stdin".
4857
(merge a2585719b3 jc/name-rev-stdin later to maint).
4958

59+
* "git update-index", "git checkout-index", and "git clean" are
60+
taught to work better with the sparse checkout feature.
61+
5062

5163
Fixes since v2.35
5264
-----------------
@@ -140,6 +152,16 @@ Fixes since v2.35
140152
* "git diff --diff-filter=aR" is now parsed correctly.
141153
(merge 75408ca949 js/diff-filter-negation-fix later to maint).
142154

155+
* When "git subtree" wants to create a merge, it used "git merge" and
156+
let it be affected by end-user's "merge.ff" configuration, which
157+
has been corrected.
158+
(merge 9158a3564a tk/subtree-merge-not-ff-only later to maint).
159+
160+
* Unlike "git apply", "git patch-id" did not handle patches with
161+
hunks that has only 1 line in either preimage or postimage, which
162+
has been corrected.
163+
(merge 757e75c81e jz/patch-id-hunk-header-parsing-fix later to maint).
164+
143165
* Other code cleanup, docfix, build fix, etc.
144166
(merge cfc5cf428b jc/find-header later to maint).
145167
(merge 40e7cfdd46 jh/p4-fix-use-of-process-error-exception later to maint).
@@ -157,3 +179,5 @@ Fixes since v2.35
157179
(merge 45d0212a71 ll/doc-mktree-typofix later to maint).
158180
(merge e9b272e4c1 js/no-more-legacy-stash later to maint).
159181
(merge 6798b08e84 ab/do-not-hide-failures-in-git-dot-pm later to maint).
182+
(merge 9325285df4 po/doc-check-ignore-markup-fix later to maint).
183+
(merge cd26cd6c7c sy/modernize-t-lib-read-tree-m-3way later to maint).

0 commit comments

Comments
 (0)