[dev] How to develop changes in a series

Jeremy Stanley fungi at yuggoth.org
Wed Dec 5 19:52:28 UTC 2018


On 2018-12-05 14:48:37 -0500 (-0500), William M Edmonds wrote:
> Eric Fried <openstack at fried.cc> wrote on 12/05/2018 12:18:37 PM:
> 
> <snip>
> 
> > But I want to edit 1b2c453, while leaving ebb3505 properly stacked on
> > top of it. Here I use a tool called `git restack` (run `pip install
> > git-restack` to install it).
> 
> It's worth noting that you can just use `git rebase` [1], you don't have to
> use git-restack. This is why later you're using `git rebase --continue`,
> because git-restack is actually using rebase under the covers.
> 
> [1] https://stackoverflow.com/questions/1186535/how-to-modify-a-specified-commit

You can, however what git-restack does for you is figure out which
commit to rebase on top of so that you don't inadvertently rebase
your stack of changes onto a newer branch state and then make things
harder on reviewers.
-- 
Jeremy Stanley
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 963 bytes
Desc: not available
URL: <http://lists.openstack.org/pipermail/openstack-discuss/attachments/20181205/2d989654/attachment.sig>


More information about the openstack-discuss mailing list