Skip to content

Add revup reset command implementation - #218

Closed
zach-grant-skydio wants to merge 1 commit into
mainfrom
zach.grant/revup/main/add-reset
Closed

zach-grant-skydio wants to merge 1 commit into
mainfrom
zach.grant/revup/main/add-reset

Conversation

@zach-grant-skydio

Copy link
Copy Markdown
  • Add reset.py module with main reset functionality
  • Add hard_reset() method to Git class in git.py
  • Register reset command in revup.py parser and command handling
  • Add documentation in docs/reset.md

The reset command performs 'git reset --hard @{u}' to reset the current
branch to match its upstream tracking branch.

Motivation:

When working with revup across multiple computers (specifically
important when working remotely with limited internet) it is often needed
to reset your local branch to what has been pushed by another computer
before continuing development. This adds a quick shortcut for doing
that.

Of course you can run the git command directly, or create an
alias, but that requires extra setup when using temporary machines such
as Coder instances frequently. This packages it neatly with revup.

topic: add-reset
branches: main
reviewers:

@zach-grant-skydio

Copy link
Copy Markdown
Author

Reviews in this chain:
└#218 Add revup reset command implementation

@zach-grant-skydio

zach-grant-skydio commented Oct 12, 2025 •

Copy link
Copy Markdown
Author
# head base diff date summary
0 f43b18ce de50e2ec diff Oct 12 13:26 PM 4 files changed, 91 insertions(+), 1 deletion(-)
1 5aae8d19 de50e2ec diff Oct 12 13:32 PM 2 files changed, 6 insertions(+), 7 deletions(-)
2 723d6c69 de50e2ec diff Oct 12 13:41 PM 1 file changed, 2 insertions(+), 2 deletions(-)
3 788f54c9 de50e2ec diff Oct 12 13:46 PM 1 file changed, 4 insertions(+), 4 deletions(-)
4 508e8076 de50e2ec diff Oct 12 13:50 PM 2 files changed, 2 insertions(+), 2 deletions(-)

@zach-grant-skydio
zach-grant-skydio force-pushed the zach.grant/revup/main/add-reset branch 3 times, most recently from 723d6c6 to 788f54c Compare October 12, 2025 18:46
- Add reset.py module with main reset functionality
- Add hard_reset() method to Git class in git.py
- Register reset command in revup.py parser and command handling
- Add documentation in docs/reset.md

The reset command performs 'git reset --hard @{u}' to reset the current
branch to match its upstream tracking branch.

Motivation:

When working with revup across multiple computers (specifically
important when working remotely with limited internet) it is often needed
to reset your local branch to what has been pushed by another computer
before continuing development. This adds a quick shortcut for doing
that.

Of course you can run the git command directly, or create an
alias, but that requires extra setup when using temporary machines such
as Coder instances frequently. This packages it neatly with revup.

topic: add-reset
branches: main
reviewers:
@zach-grant-skydio
zach-grant-skydio force-pushed the zach.grant/revup/main/add-reset branch from 788f54c to 508e807 Compare October 12, 2025 18:50
@zach-grant-skydio

Copy link
Copy Markdown
Author

I'm somewhat unsure if this is the best approach but wanted to put it out there for comment.

The goal here is to allow the user to easily make sure they are working on top of the latest changes in the revup stack that has been uploaded already. One thing I have been going back and forth on is if we would want this to reset to the upstream of the current branch you are working on (which would be a non-revup branch if you are working on master for instance) or if we want to always point to the revup created branch for the topic you are working on.

This implementation is for the former, but I think the latter may actually make more sense.

@jerry-skydio

jerry-skydio commented Feb 3, 2026 •

Copy link
Copy Markdown
Collaborator

I'm certainly open to revup utilities but have to draw a line somewhere

This is equivalent to running git reset --hard @{u}.

If the functionality is so simple that it could be a one line bash macro, i don't think its worth the effort for this project to support, document, and maintain it

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.

2 participants