feat: add stg branch --reset command to soft reset the stack#601
feat: add stg branch --reset command to soft reset the stack#601NonLogicalDev wants to merge 1 commit intostacked-git:masterfrom
Conversation
18b79a4 to
fbd6c60
Compare
…all patches as unapplied Introduce an alternative to `stg repair` for more manual control over stack metadata repair process. Example usage: * Run `stg branch --reset` to force mark all patches in the stack as unapplied without changing HEAD. * Manually reconcile the stack state by running `stg push --merged` or `stg uncommit`.
fbd6c60 to
08d2c46
Compare
|
Hello @jpgrayson, I have been using a private fork with this command for a few months now. It can come in handy in cases where I think |
jpgrayson
left a comment
There was a problem hiding this comment.
I don't fully understand the use case for this, but I'll accept the feature. I know this is something you've been thinking about for a long time. Very much appreciate the PR.
Also, the code is clean, thank you.
However, what I need is a couple tests that exercise this code path.
|
Will add the tests and resubmit! Thank you @jpgrayson As for the usecase: In my company we have lots of tools that very eagerly re-write local history. Say I have a stack of changes: I run There are currently two ways to recover:
I am introducing third more explicit way with this change:
|
Introduce alternative to
stg repairfor more manual control over stack metadata repair process.Example usage:
stg branch --resetto force mark all patches in the stack as unapplied without changing HEAD.stg push --mergedorstg uncommit.issue: #181