Skip to content

Conversation

AndreasArvidsson
Copy link
Member

@AndreasArvidsson AndreasArvidsson commented Feb 5, 2025

Fixes #2812

Release notes

Added several new commends for manipulating your local changes with git:

"git stage <target>" to stage changes
"git unstage <target>" to unstage changes
"git revert <target>" to revert changes
"git accept <target>" to accept conflicts

(<target>s can span multiple lines or even hunks of changes. When smaller than a line, VS Code will operate on the line containing the target.)

@phillco
Copy link
Member

phillco commented Feb 6, 2025

Let's do git unstage instead of reset. Reset is a bit tricky to make a single spoken verb because it has multiple functions depending on which parameters you pass, but given the existence of --hard I think "unstage" will appear friendlier

@phillco phillco enabled auto-merge February 6, 2025 05:52
@phillco phillco added this pull request to the merge queue Feb 6, 2025
Merged via the queue into main with commit 09e4322 Feb 6, 2025
25 checks passed
@phillco phillco deleted the gitActions branch February 6, 2025 06:08
cursorless-bot pushed a commit that referenced this pull request Feb 6, 2025
Fixes #2812

## Release notes

Added several new commends for manipulating your local changes with
`git`:

`"git stage <target>"` to stage changes
`"git unstage <target>"` to unstage changes
`"git revert <target>"` to revert changes
`"git accept <target>"` to accept conflicts

(`<target>`s can span multiple lines or even hunks of changes. When
smaller than a line, VS Code will operate on the line containing the
target.)

---------

Co-authored-by: Phil Cohen <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Add git actions

2 participants