Re:Stacked Git – manage commits as a stack of patches
by Quekid5 on Saturday May 29, 2021 @07:45PM
(#27329268)
I'm afraid I still don't understand the workflow. I continually rebase my branch(es) on top of upstream.
At any time, I can choose to consolidate a few of my WIP commits into a more (logically) cohesive commit and keep that around for further rebasing.
I must be missing something here, but I'm not sure what.
(If it helps understanding, we work with Gerrit which basically expects a 'list of patches' on top of the branch you want to commit your changes to. So that's already part of our mentality, but we just use plain git.)
At any time, I can choose to consolidate a few of my WIP commits into a more (logically) cohesive commit and keep that around for further rebasing.
I must be missing something here, but I'm not sure what.
(If it helps understanding, we work with Gerrit which basically expects a 'list of patches' on top of the branch you want to commit your changes to. So that's already part of our mentality, but we just use plain git.)