Skip to content

Commit d2db86e

Browse files
committed
Mention Bug Fix in release notes
`git stash` [no longer records skip-worktree files as deleted](git-for-windows/git#2378) after resolving merge conflicts in them. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 40705ee commit d2db86e

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

ReleaseNotes.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ Note! As a consequence of making `git config --system` work as expected, the loc
5555
* The (still experimental) built-in `git add -p` [no longer gets confused about incomplete lines](https://github.com/git-for-windows/git/pull/2368) (i.e. a file's l last line that does not end in a Line Feed).
5656
* A buffer overrun in the code to determine which files need to be marked as hidden [was plugged](https://github.com/git-for-windows/git/pull/2371).
5757
* The support for `sendpack.sideband` that was removed by mistake [was re-introduced](https://github.com/git-for-windows/git/pull/2375), to support `git push` via the `git://` protocol again.
58+
* `git stash` [no longer records skip-worktree files as deleted](https://github.com/git-for-windows/git/pull/2378) after resolving merge conflicts in them.
5859

5960
## Changes since Git for Windows v2.22.0 (June 8th 2019)
6061

0 commit comments

Comments
 (0)