diff --git a/CHANGELOG.md b/CHANGELOG.md index 868a379..812ec71 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,6 +37,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p - Fixes [1336](https://github.com/eamodio/vscode-gitlens/issues/1336) - Need to allow GitLens to connect to GitHub in every Codespace (requires VS Code v1.54-insiders or later) - Fixes [1363](https://github.com/eamodio/vscode-gitlens/issues/1363) - Error 'Unable to open compare', when git setting log.showsignature is active - Fixes [1368](https://github.com/eamodio/vscode-gitlens/issues/1368) - Suppress message "GitLens was unable to find Git" +- Fixes an issue where the rebase status in the views could get "stuck" after a rebase completed - Fixes typo in README — thanks to [PR #1374](https://github.com/eamodio/vscode-gitlens/pull/1374) by David Rees ([@studgeek](https://github.com/studgeek)) ## [11.2.1] - 2021-02-02 diff --git a/src/git/models/repository.ts b/src/git/models/repository.ts index d4a61d6..66d768c 100644 --- a/src/git/models/repository.ts +++ b/src/git/models/repository.ts @@ -248,7 +248,10 @@ export class Repository implements Disposable { **/.git/index,\ **/.git/HEAD,\ **/.git/*_HEAD,\ +**/.git/MERGE_*,\ **/.git/refs/**,\ +**/.git/rebase-merge/**,\ +**/.git/sequencer/**,\ **/.gitignore\ }', ),