Skip to content

Commit

Permalink
Release v1.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Greenscreen23 committed Mar 31, 2022
1 parent 128dc44 commit 3858baf
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 14 deletions.
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,12 @@
- Added two commands
- Interactive rebase (`git rebase -i <branch>`)
- Hard reset (`git reset --hard origin/<branch>`)

## Version 1.1.0

- Feature refactoring
- Interactive Rebase
- Now allows selecting from a list of branches, just like the normal vscodes rebase dialog
- Allows running in a terminal or even switching `core.editor` to vscode only for the rebase.
- Hard Reset
- Added a modal to ask before hard resetting
8 changes: 0 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,3 @@ This extension requires git to be installed. \([git-scm.com](https://git-scm.com
We are currently working on integrating tests into the extension. Currently, the tests are the default ones created bei Yeoman.

If you have any issues, please consider submitting them on [github](https://github.com/Greenscreen23/git-extra-commands)

## Release Notes

### 1.0.0

Initial release of Extra Git Commands.

Added the commands for interactive rebase and hard reset.
Binary file removed images/branch-input.png
Binary file not shown.
7 changes: 4 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 7 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"name": "Lukas Hagen"
},
"engines": {
"vscode": "^1.63.0"
"vscode": "^1.65.0"
},
"categories": [
"Other"
Expand All @@ -36,7 +36,11 @@
"git-extra-commands.interactiveRebase.rebaseMode": {
"type": "string",
"default": "useTerminal",
"enum": ["avoidTerminal", "switchEditor", "useTerminal"],
"enum": [
"avoidTerminal",
"switchEditor",
"useTerminal"
],
"enumDescriptions": [
"This uses a normal process instead of the integrated terminal for the interactive rebase. It is recommended to set core.editor to a graphical editor (e.g. vscode) in your git config, because a normal process cannot execute terminal editors like vim or nano",
"Experimental: Switches the core.editor git setting to vscode only for the duration of the rebase. This is intended to be used with the gitlens extension and the interactive rebase editor enabled, and when you want to continue using your normal editor outside from vscode.",
Expand Down Expand Up @@ -71,7 +75,7 @@
"@typescript-eslint/eslint-plugin": "^5.1.0",
"@typescript-eslint/parser": "^5.1.0",
"@vscode/test-electron": "^1.6.2",
"esbuild": "^0.14.9",
"esbuild": "^0.14.29",
"eslint": "^8.1.0",
"glob": "^7.1.7",
"mocha": "^9.1.3",
Expand Down

0 comments on commit 3858baf

Please sign in to comment.