diff --git a/docs/Stacked_Branches.md b/docs/Stacked_Branches.md index b73e4aca5..3e943e791 100644 --- a/docs/Stacked_Branches.md +++ b/docs/Stacked_Branches.md @@ -7,7 +7,7 @@ refactorings, one for backend changes, and one for frontend changes. Those branches would then all be stacked onto each other. Git has support for rebasing such a stack as a whole; you can enable it by -setting the git config `rebase.updateRfs` to true. If you then rebase the +setting the git config `rebase.updateRefs` to true. If you then rebase the topmost branch of the stack, the other ones in the stack will follow. This includes interactive rebases, so for example amending a commit in the first branch of the stack will "just work" in the sense that it keeps the other