Jeremy Stanley fungi@yuggoth.org wrote on 12/05/2018 02:52:28 PM:
On 2018-12-05 14:48:37 -0500 (-0500), William M Edmonds wrote:
Eric Fried openstack@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
Ah, that's good to know.
Also, found this existing documentation [2] if someone wants to propose an update or link from another location. Note that it doesn't currently mention git-restack, just rebase.
[2] https://docs.openstack.org/contributors/code-and-documentation/patch-best-pr...