Browse Source

Fixes #400 - Reset TO commit also resets chosen one

main
Eric Amodio 6 years ago
parent
commit
fa00c94850
2 changed files with 2 additions and 1 deletions
  1. +1
    -0
      CHANGELOG.md
  2. +1
    -1
      src/views/explorerCommands.ts

+ 1
- 0
CHANGELOG.md View File

@ -9,6 +9,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
- Adds clipboard support for Linux without requiring any external dependencies — thanks to [PR #394](https://github.com/eamodio/vscode-gitlens/pull/394) by Cédric Malard ([@cmalard](https://github.com/cmalard))
### Fixed
- Fixes [#400](https://github.com/eamodio/vscode-gitlens/issues/400) - Reset TO commit also resets chosen one
- Fixes [#397](https://github.com/eamodio/vscode-gitlens/issues/397) - Error while opening the gitlens view using `Open View` command
- Fixes [#391](https://github.com/eamodio/vscode-gitlens/issues/391) - GitLens adds some settings in settings.json
- Fixes another case of [#343](https://github.com/eamodio/vscode-gitlens/issues/343) - Can't show blame when VSCode starts on branch without upstream — thanks to [PR #390](https://github.com/eamodio/vscode-gitlens/pull/390) by ryenus ([@ryenus](https://github.com/ryenus))

+ 1
- 1
src/views/explorerCommands.ts View File

@ -303,7 +303,7 @@ export class ExplorerCommands extends Disposable {
terminalResetCommit(node: ExplorerNode) {
if (!(node instanceof CommitNode)) return;
this.sendTerminalCommand('reset', `--soft ${node.ref}^`, node.repoPath);
this.sendTerminalCommand('reset', `--soft ${node.ref}`, node.repoPath);
}
terminalRevertCommit(node: ExplorerNode) {

Loading…
Cancel
Save